FYI: missing makeinfo without -o nor @setfilename

[Alexandre Duret-Lutz]

I'm installing this on HEAD and branch-1-9.

2005-02-08  Alexandre Duret-Lutz  <address@hidden>

        * lib/missing (makeinfo): Compute the output file if neither -o
        nor @setfilename is used.
        Reported by Miroslaw Dobrzanski-Neumann and Bruno Haible.

Index: THANKS
===================================================================
RCS file: /cvs/automake/automake/THANKS,v
retrieving revision 1.256.2.7
diff -u -r1.256.2.7 THANKS
--- THANKS      5 Jan 2005 19:04:21 -0000       1.256.2.7
+++ THANKS      8 Feb 2005 21:20:44 -0000
@@ -169,6 +169,7 @@
 Miloslav Trmac         address@hidden
 Miodrag Vallat         address@hidden
 Mirko Streckenbach     address@hidden
+Miroslaw Dobrzanski-Neumann address@hidden
 Morten Eriksen         address@hidden
 Motoyuki Kasahara      address@hidden
 Nathanael Nerode       address@hidden
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 8 Feb 2005 21:20:44 -0000
@@ -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 @@
          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