[Python-checkins] python/dist/src/Doc/perl l2hinit.perl,1.79,1.80

[fdrake at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Doc/perl
In directory sc8-pr-cvs1:/tmp/cvs-serv1526

Modified Files:
	l2hinit.perl 
Log Message:
Make sure LaTeX2HTML's $TEXINPUTS variable is initialized to include
directories identified in the TEXINPUTS environment variable.
I think this is the last part of the fix for the version number
problems seen in the documentation for the 2.3.1 release.


Index: l2hinit.perl
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/perl/l2hinit.perl,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** l2hinit.perl	11 Sep 2003 04:14:20 -0000	1.79
--- l2hinit.perl	27 Sep 2003 16:04:23 -0000	1.80
***************
*** 89,92 ****
--- 89,96 ----
      # processing.
      #
+     # XXX This still isn't quite right; we should actually be inserting
+     # $mytexinputs just before any empty entry in TEXINPUTS is one
+     # exists instead of just concatenating the pieces like we do here.
+     #
      my $file = $_[0];
      my($jobname, $dir, $ext) = fileparse($file, '\..*');
***************
*** 94,98 ****
      $dir =~ s/$dd$//;
      $TEXINPUTS = "$dir$envkey$mytexinputs";
!     print "\nAdding $dir to \$TEXINPUTS\n";
  }
  
--- 98,110 ----
      $dir =~ s/$dd$//;
      $TEXINPUTS = "$dir$envkey$mytexinputs";
!     # Push everything into $TEXINPUTS since LaTeX2HTML doesn't pick
!     # this up on it's own; we clear $ENV{'TEXINPUTS'} so the value set
!     # for this by the main LaTeX2HTML script doesn't contain duplicate
!     # directories.
!     if ($ENV{'TEXINPUTS'}) {
!         $TEXINPUTS .= "$envkey$ENV{'TEXINPUTS'}";
!         $ENV{'TEXINPUTS'} = undef;
!     }
!     print "\nSetting \$TEXINPUTS to $TEXINPUTS\n";
  }