texinfo update (Tue Sep 20 06:22:01 EDT 2005)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.536
retrieving revision 1.537
diff -c -r1.536 -r1.537
*** ChangeLog   17 Sep 2005 21:56:54 -0000      1.536
--- ChangeLog   20 Sep 2005 09:58:49 -0000      1.537
***************
*** 1,3 ****
--- 1,8 ----
+ 2005-09-20  Akim Demaille  <address@hidden>
+ 
+       * util/texi2dvi: Be sure to return to the current directory even
+       after obeying --clean.
+ 
  2005-09-17  Sergey Poznyakoff  <address@hidden>  (tiny change)
  
        * makeinfo/cmds.c (handle_include): don't expand @verbatiminclude,
Index: util/texi2dvi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.60
retrieving revision 1.61
diff -c -r1.60 -r1.61
*** util/texi2dvi       5 Sep 2005 13:46:15 -0000       1.60
--- util/texi2dvi       20 Sep 2005 09:58:50 -0000      1.61
***************
*** 1,6 ****
  #! /bin/sh
  # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
! # $Id: texi2dvi,v 1.60 2005/09/05 13:46:15 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 (La)TeX) sources.
! # $Id: texi2dvi,v 1.61 2005/09/20 09:58:50 kasal 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.60 $'
  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.61 $'
  rcs_version=`set - $rcs_revision; echo $2`
  program=`echo $0 | sed -e 's!.*/!!'`
  version="texi2dvi (GNU Texinfo 4.8) $rcs_version
***************
*** 1023,1040 ****
    # and TeX one last time.
    run_thumbpdf
  
!   # Return to the original directory so that
!   # - the next file is processed in correct conditions
!   # - the temporary file can be removed
!   cd / # in case $orig_pwd is on a different drive (for DOS)
!   cd "$orig_pwd" || exit 1
  
    # Remove temporary files.
    if $clean; then
      verbose "Removing $t2ddir"
-     cd /
      rm -rf "$t2ddir"
    fi
  done
  
  verbose "done."
--- 1023,1042 ----
    # and TeX one last time.
    run_thumbpdf
  
!   # Both to make sure we can remove $t2ddir (we might have cd'd into
!   # it), and in case $orig_pwd is on a different drive (for DOS).
!   cd /
  
    # Remove temporary files.
    if $clean; then
      verbose "Removing $t2ddir"
      rm -rf "$t2ddir"
    fi
+ 
+   # Return to the original directory so that
+   # - the next file is processed in correct conditions
+   # - the temporary file can be removed
+   cd "$orig_pwd" || exit 1
  done
  
  verbose "done."
P ChangeLog
P util/texi2dvi