Re: texi2dvi: Beware of local, and find DVIPS figures

[Akim Demaille]

>>> "Karl" == Karl Berry <address@hidden> writes:

 > For bootstrapping, it's usually gnulib madness; 
 > gnulib-tool --update might help.  I just updated CVS again with the
 > latest gnulib.

But where is that gnulib-tool stuff?  The README.dev say to run it
from the top-level, but I don't have such a tool.

 > I saw you committed your changes -- anything else left outstanding
 > at this point?

I applied the following changes, so I think I'm done for now :)

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * util/texi2dvi: Fix some "local" usages.
        * util/local.test: Make the test more robust.

Index: util/local.test
===================================================================
RCS file: /cvsroot/texinfo/texinfo/util/local.test,v
retrieving revision 1.10
diff -u -u -r1.10 local.test
--- util/local.test 25 Jul 2007 12:18:41 -0000 1.10
+++ util/local.test 25 Jul 2007 13:18:39 -0000
@@ -25,7 +25,11 @@
 
 # Make sure quotes are used to protect the value.  See the comment in
 # texi2dvi itself about local.
-if $EGREP "^ *local [a-zA-Z_0-9]*=[^\"']" $TEXI2DVI; then
+if sed -e 's/^[         ]*#.*//' $TEXI2DVI |
+    $EGREP "\blocal [a-zA-Z_0-9]*=[^\"']" |
+    $EGREP -v "\blocal [a-zA-Z_0-9]*=[a-zA-Z0-9]*$" |
+    grep .
+then
   false
 else
   true
Index: util/texi2dvi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.103
diff -u -u -r1.103 texi2dvi
--- util/texi2dvi 24 Jul 2007 14:50:55 -0000 1.103
+++ util/texi2dvi 25 Jul 2007 13:18:39 -0000
@@ -486,7 +486,8 @@
   local replace_empty="-e 's/^$path_sep/EMPTY$path_sep/g' \
                       -e 's/$path_sep\$/${path_sep}EMPTY/g' \
                       -e 's/$path_sep$path_sep/${path_sep}EMPTY:/g'"
-  local res=`echo "$1" | eval sed $replace_empty`
+  local res
+  res=`echo "$1" | eval sed $replace_empty`
   save_IFS=$IFS
   IFS=$path_sep
   set x $res; shift
@@ -515,8 +516,10 @@
 {
   case $oname in
     '') echo "$1";;
-     *) local out_noext=`echo "$oname" | sed 's/\.[^.]*$//'`
-       local file_ext=`echo "$1" | sed 's/^.*\.//'`
+     *) local out_noext
+       out_noext=`echo "$oname" | sed 's/\.[^.]*$//'`
+       local file_ext
+       file_ext=`echo "$1" | sed 's/^.*\.//'`
        echo "$out_noext.$file_ext"
       ;;
   esac
@@ -1084,7 +1087,8 @@
     work_src=$workdir/src
     ensure_dir "$work_src"
     in_src=$work_src/$in_base
-    local miincludes=`list_prefix includes -I`
+    local miincludes
+    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"',