texinfo ChangeLog util/texi2dvi

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       09/04/13 00:39:49

Modified files:
        .              : ChangeLog 
        util           : texi2dvi 

Log message:
        avoid incorrect :: sequence when no -I is specified; report fro Bruno 
Haible, bug-texinfo 8 Apr 2009 01:24:09

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.994&r2=1.995
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/texi2dvi?cvsroot=texinfo&r1=1.139&r2=1.140

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.994
retrieving revision 1.995
diff -u -b -r1.994 -r1.995
--- ChangeLog   13 Apr 2009 00:29:37 -0000      1.994
+++ ChangeLog   13 Apr 2009 00:39:48 -0000      1.995
@@ -1,5 +1,9 @@
 2009-04-12  Karl Berry  <address@hidden>
 
+       * util/texi2dvi (compile): do not create a wrong :: sequence
+       in the middle of the path due to an empty txincludes (no -I's).
+       Report from Bruno Haible, 8 Apr 2009 01:24:09.
+
        * util/texi2pdf,
        * util/pdftexi2dvi: handle --version to hardwire the program name.
        * util/texi2dvi (usage): mention PDF output.

Index: util/texi2dvi
===================================================================
RCS file: /sources/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -b -r1.139 -r1.140
--- util/texi2dvi       13 Apr 2009 00:29:37 -0000      1.139
+++ util/texi2dvi       13 Apr 2009 00:39:48 -0000      1.140
@@ -1,6 +1,6 @@
 #! /bin/sh
 # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
-# $Id: texi2dvi,v 1.139 2009/04/13 00:29:37 karl Exp $
+# $Id: texi2dvi,v 1.140 2009/04/13 00:39:48 karl Exp $
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
 # 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -33,7 +33,7 @@
 set -e
 
 # This string is expanded automatically when this file is checked out.
-rcs_revision='$Revision: 1.139 $'
+rcs_revision='$Revision: 1.140 $'
 rcs_version=`set - $rcs_revision; echo $2`
 program=`echo $0 | sed -e 's!.*/!!'`
 
@@ -1430,9 +1430,14 @@
   # `.' goes first to ensure that any old .aux, .cps,
   # etc. files in ${directory} don't get used in preference to fresher
   # files in `.'.  Include orig_pwd in case we are in clean build mode, where
-  # we've cd'd to a temp directory.
+  # we have cd'd to a temp directory.
+  common="$orig_pwd$path_sep$in_dir$path_sep"
+  #
+  # If we have any includes, put those at the end.
+  # Keep a final path_sep to get the default (system) TeX directories included.
   txincludes=`list_infix includes $path_sep`
-  common="$orig_pwd$path_sep$in_dir$path_sep$txincludes$path_sep"
+  test -n "$txincludes" && common="$common$txincludes$path_sep"
+  #
   for var in $tex_envvars; do
     eval val="\$common\$${var}_orig"
     # Convert relative paths to absolute paths, so we can run in another