* lib/missing (makeinfo): Compute the output file if neither -o

nor @setfilename is used.
Reported by Miroslaw Dobrzanski-Neumann and Bruno Haible.

diff --git a/ChangeLog b/ChangeLog
index 3bc73997f2fd8c0bf5474d9013ab0329852bb240..4f69d1607a9858426f3fc7d94d2b72237f8c778d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-08  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * lib/missing (makeinfo): Compute the output file if neither -o
+       nor @setfilename is used.
+       Reported by Miroslaw Dobrzanski-Neumann and Bruno Haible.
+
 2005-02-07  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * doc/automake.texi (Requirements): Show one example of

diff --git a/THANKS b/THANKS
index 9c2b0fe44a37d32712441fc04e3ef760c803a3e5..973b3973492d2433865252f047b26501b569a984 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -170,6 +170,7 @@ Miles Bader         miles@ccs.mt.nec.co.jp
 Miloslav Trmac         trmac@popelka.ms.mff.cuni.cz
 Miodrag Vallat         miodrag@ifrance.com
 Mirko Streckenbach     strecken@infosun.fmi.uni-passau.de
+Miroslaw Dobrzanski-Neumann mne@mosaic-ag.com
 Morten Eriksen         mortene@sim.no
 Motoyuki Kasahara      m-kasahr@sra.co.jp
 Nathanael Nerode       neroden@twcny.rr.com

diff --git a/lib/missing b/lib/missing
index a9ab6cb2c338dc57aebdf6ad0276fd4b0a9f2a48..09edd8844dedc652ffe4d9aa931eed179489019f 100755 (executable)
--- a/lib/missing
+++ b/lib/missing
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2005-02-02.21
+scriptversion=2005-02-08.22
 
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
 #   Free Software Foundation, Inc.
@@ -288,10 +288,14 @@ WARNING: \`$1' is $msg.  You should only need it if
          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 '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+      # ... or it is the one specified with @setfilename ...
+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '/^@setfilename/ { 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
     ;;