texinfo update (Tue May 4 09:22:01 EDT 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.342
retrieving revision 1.343
diff -c -r1.342 -r1.343
*** ChangeLog   30 Apr 2004 12:43:13 -0000      1.342
--- ChangeLog   4 May 2004 13:06:00 -0000       1.343
***************
*** 1,3 ****
--- 1,9 ----
+ 2004-05-04  Karl Berry  <address@hidden>
+ 
+       * util/texi2dvi (TEX): don't use the value when it ends in
+       "latex"; TEX is also used by mpost.  Report from
+       address@hidden
+ 
  2004-04-29  Karl Berry  <address@hidden>
  
        * doc.texinfo.txi (Invoking makeinfo): mention --plaintext.
Index: util/texi2dvi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.29
retrieving revision 1.30
diff -c -r1.29 -r1.30
*** util/texi2dvi       11 Apr 2004 17:56:47 -0000      1.29
--- util/texi2dvi       4 May 2004 13:04:32 -0000       1.30
***************
*** 1,6 ****
  #! /bin/sh
  # texi2dvi --- produce DVI (or PDF) files from Texinfo (or LaTeX) sources.
! # $Id: texi2dvi,v 1.29 2004/04/11 17:56:47 karl Exp $
  #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
  # 2002, 2003, 2004 Free Software Foundation, Inc.
--- 1,6 ----
  #! /bin/sh
  # texi2dvi --- produce DVI (or PDF) files from Texinfo (or LaTeX) sources.
! # $Id: texi2dvi,v 1.30 2004/05/04 13:04:32 karl Exp $
  #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
  # 2002, 2003, 2004 Free Software Foundation, Inc.
***************
*** 27,33 ****
  # the `--debug' option when making a bug report.
  
  # This string is expanded by rcs automatically when this file is checked out.
! rcs_revision='$Revision: 1.29 $'
  rcs_version=`set - $rcs_revision; echo $2`
  program=`echo $0 | sed -e 's!.*/!!'`
  version="texi2dvi (GNU Texinfo 4.7) $rcs_version
--- 27,33 ----
  # the `--debug' option when making a bug report.
  
  # This string is expanded by rcs automatically when this file is checked out.
! rcs_revision='$Revision: 1.30 $'
  rcs_version=`set - $rcs_revision; echo $2`
  program=`echo $0 | sed -e 's!.*/!!'`
  version="texi2dvi (GNU Texinfo 4.7) $rcs_version
***************
*** 506,512 ****
        texindex=${TEXINDEX:-texindex}
        textra_cmd='/address@hidden/a'
        if test $oformat = dvi; then
!         tex=$TEX
        else
          tex=$PDFTEX
        fi
--- 506,518 ----
        texindex=${TEXINDEX:-texindex}
        textra_cmd='/address@hidden/a'
        if test $oformat = dvi; then
!         # MetaPost also uses the TEX environment variable.  If the user
!         # has set TEX=latex for that reason, don't bomb out.
!         if echo $TEX | grep 'latex$' >/dev/null; then
!           tex=tex  # don't bother trying to find etex
!         else
!           tex=$TEX
!         fi
        else
          tex=$PDFTEX
        fi
P ChangeLog
P util/texi2dvi