texinfo update (Fri Jan 28 09:52:01 EST 2005)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.457
retrieving revision 1.458
diff -c -r1.457 -r1.458
*** ChangeLog   25 Jan 2005 16:45:42 -0000      1.457
--- ChangeLog   28 Jan 2005 14:41:57 -0000      1.458
***************
*** 1,3 ****
--- 1,15 ----
+ 2005-01-28  Karl Berry  <address@hidden>
+ 
+       * util/texi2dvi <verbose>: rename variable to verb, since
+               functions and variables apparently cannot have the same
+               name on Digital UNIX 4.0E, AIX 3.2.5 (325102), ULTRIX V4.5.
+               (and related releases, presumably).
+         <pgm>: simplify sed expression to avoid \| operator, which does
+               not work on above platforms (and also be more correct).
+       <RUNNING_KSH>: switch to ksh under Ultrix.
+       All of this stuff reported by Bernhard Simon <address@hidden>
+       and te.
+ 
  2005-01-25  Karl Berry  <address@hidden>
  
        * doc/Makefile (texmf_dvips, texmf_pdftex_misc): new paths to
Index: util/texi2dvi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.39
retrieving revision 1.40
diff -c -r1.39 -r1.40
*** util/texi2dvi       28 Jan 2005 01:52:04 -0000      1.39
--- util/texi2dvi       28 Jan 2005 14:41:58 -0000      1.40
***************
*** 1,6 ****
  #! /bin/sh
  # texi2dvi --- produce DVI (or PDF) files from Texinfo (or LaTeX) sources.
! # $Id: texi2dvi,v 1.39 2005/01/28 01:52:04 karl Exp $
  #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
  # 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
--- 1,6 ----
  #! /bin/sh
  # texi2dvi --- produce DVI (or PDF) files from Texinfo (or LaTeX) sources.
! # $Id: texi2dvi,v 1.40 2005/01/28 14:41:58 karl Exp $
  #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
  # 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
***************
*** 32,38 ****
  unset RUNNING_KSH
  
  # This string is expanded by rcs automatically when this file is checked out.
! rcs_revision='$Revision: 1.39 $'
  rcs_version=`set - $rcs_revision; echo $2`
  program=`echo $0 | sed -e 's!.*/!!'`
  version="texi2dvi (GNU Texinfo 4.8) $rcs_version
--- 32,38 ----
  unset RUNNING_KSH
  
  # This string is expanded by rcs automatically when this file is checked out.
! rcs_revision='$Revision: 1.40 $'
  rcs_version=`set - $rcs_revision; echo $2`
  program=`echo $0 | sed -e 's!.*/!!'`
  version="texi2dvi (GNU Texinfo 4.8) $rcs_version
***************
*** 102,108 ****
  tmpdir=${TMPDIR:-/tmp}/t2d$$  # avoid collisions on 8.3 filesystems.
  txincludes=     # TEXINPUTS extensions, with trailing colon
  txiprereq=19990129 # minimum texinfo.tex version with macro expansion
! verbose=false   # echo for verbose mode
  
  orig_pwd=`pwd`
  
--- 102,108 ----
  tmpdir=${TMPDIR:-/tmp}/t2d$$  # avoid collisions on 8.3 filesystems.
  txincludes=     # TEXINPUTS extensions, with trailing colon
  txiprereq=19990129 # minimum texinfo.tex version with macro expansion
! verb=false      # echo for verbose mode
  
  orig_pwd=`pwd`
  
***************
*** 144,150 ****
  # Report some verbose information.
  verbose ()
  {
!   $verbose >&2 "$0: $@"
  }
  
  # Report an error and exit with failure.
--- 144,150 ----
  # Report some verbose information.
  verbose ()
  {
!   $verb >&2 "$0: $@"
  }
  
  # Report an error and exit with failure.
***************
*** 215,221 ****
      -t | --tex* | --com* ) shift; textra="$textra\\
  "`echo "$1" | sed 's/\\\\/\\\\\\\\/g'`;;
      -v | --vers*) echo "$version"; exit 0;;
!     -V | --verb*) verbose=echo;;
      --) # What remains are not options.
        shift
        while test x"$1" != x"$arg_sep"; do
--- 215,221 ----
      -t | --tex* | --com* ) shift; textra="$textra\\
  "`echo "$1" | sed 's/\\\\/\\\\\\\\/g'`;;
      -v | --vers*) echo "$version"; exit 0;;
!     -V | --verb*) verb=echo;;
      --) # What remains are not options.
        shift
        while test x"$1" != x"$arg_sep"; do
P ChangeLog
P util/texi2dvi