texinfo update (Sun Feb 5 20:52:01 EST 2006)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.564
retrieving revision 1.565
diff -u -r1.564 -r1.565
--- ChangeLog   31 Jan 2006 00:36:09 -0000      1.564
+++ ChangeLog   6 Feb 2006 01:26:11 -0000       1.565
@@ -1,3 +1,8 @@
+2006-02-05  Karl Berry  <address@hidden>
+
+       * util/texi2dvi (run_makeinfo): eval $makeinfo, for gettext
+       0.14.5's complex $MAKEINFO definition.
+
 2006-01-30  Karl Berry  <address@hidden>
 
        * util/texinfo.dtd: many additions and fixes from
Index: util/texi2dvi
===================================================================
RCS file: /sources/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- util/texi2dvi       18 Jan 2006 11:56:04 -0000      1.73
+++ util/texi2dvi       6 Feb 2006 01:25:50 -0000       1.74
@@ -1,6 +1,6 @@
 #! /bin/sh
 # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
-# $Id: texi2dvi,v 1.73 2006/01/18 11:56:04 akim Exp $
+# $Id: texi2dvi,v 1.74 2006/02/06 01:25:50 karl Exp $
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -35,7 +35,7 @@
 set -e
 
 # This string is expanded by rcs automatically when this file is checked out.
-rcs_revision='$Revision: 1.73 $'
+rcs_revision='$Revision: 1.74 $'
 rcs_version=`set - $rcs_revision; echo $2`
 program=`echo $0 | sed -e 's!.*/!!'`
 version="texi2dvi (GNU Texinfo 4.8) $rcs_version
@@ -920,8 +920,12 @@
       in_src=$work_src/$in_base
       local miincludes=`list_prefix includes -I`
       verbose "Macro-expanding $command_line_filename to $in_src ..."
+      # eval $makeinfo because it might be defined as something complex
+      # (running missing) and then we end up with things like '"-I"',
+      # and "-I" (including the quotes) is not an option name.  This
+      # happens with gettext 0.14.5, at least.
       sed "$comment_iftex" "$command_line_filename" \
-        | $makeinfo --footnote-style=end -I "$in_dir" $miincludes \
+        | eval $makeinfo --footnote-style=end -I "$in_dir" $miincludes \
           -o /dev/null --macro-expand=- \
         | sed "$uncomment_iftex" >"$in_src"
       # Continue only if everything succeeded.
P ChangeLog
P util/texi2dvi