[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: needless error in "missing makeinfo"
From: |
Alexandre Duret-Lutz |
Subject: |
Re: needless error in "missing makeinfo" |
Date: |
Mon, 07 Feb 2005 23:25:30 +0100 |
User-agent: |
Gnus/5.110003 (No Gnus v0.3) Emacs/21.3.50 (gnu/linux) |
Hi Bruno,
>>> "Bruno" == Bruno Haible <address@hidden> writes:
Bruno> When "missing" is called to emulate makeinfo and the
Bruno> texi file does not have a @setfilename command,
Bruno> "missing" calls "touch" without arguments, which leads
Bruno> to exit code 1. Seen with gettext's nls.texi.
Thanks for the report and patch!
Would the patch below be OK with you? Missing's job is to touch
the file that makeinfo would produce, so it seems we just need
to compute that file name in case -o and @setfilename are not
used.
Index: lib/missing
===================================================================
RCS file: /cvs/automake/automake/lib/missing,v
retrieving revision 1.24.4.2
diff -u -r1.24.4.2 missing
--- lib/missing 2 Feb 2005 20:59:12 -0000 1.24.4.2
+++ lib/missing 7 Feb 2005 22:17:43 -0000
@@ -288,10 +288,14 @@
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
+ # The file to touch is that specified with -o ...
file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/address@hidden/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '/address@hidden/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
touch $file
;;
--
Alexandre Duret-Lutz