From: Fred Drake <fdrake@acm.org>
Date: Mon, 11 May 1998 18:23:35 +0000 (+0000)
Subject: In package Override, use the getcwd() function from the Cwd module instead of
X-Git-Tag: v1.5.2a1~681
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41814bc51fbadc5b6fa962323157343b6efc42b6;p=thirdparty%2FPython%2Fcpython.git

In package Override, use the getcwd() function from the Cwd module instead of
the one from Override.pm (part of latex2html).

Absolutize the TEXINPUTS environment variable, since we can't count on
latex2html doing it for us (even though I sent in a patch, and it really
should).
---

diff --git a/Doc/perl/l2hinit.perl b/Doc/perl/l2hinit.perl
index 3841036c6d47..0085152631dc 100644
--- a/Doc/perl/l2hinit.perl
+++ b/Doc/perl/l2hinit.perl
@@ -6,6 +6,13 @@
 #  New name to avoid distributing "dot" files with the Python documentation.
 #
 
+package Override;
+
+use Cwd qw(getcwd);
+
+
+package main;
+
 $INFO = 1;              # 0 = do not make a "About this document..." section
 $MAX_LINK_DEPTH = 3;
 $ADDRESS = '';
@@ -24,6 +31,21 @@ $VERBOSITY = 0;
 $TEXINPUTS = '';		# avoid bogus l2h setting it to ':' !!!
 
 
+sub absolutize_path{
+    my $path = @_[0];
+    my $npath = '';
+    foreach $dir (split $envkey, $path) {
+	$npath .= make_directory_absolute($dir) . $envkey;
+    }
+    $npath =~ s/$envkey$//;
+    $npath;
+}
+# This is done because latex2html doesn't do this for us, but does change the
+# directory out from under us.
+if (defined $ENV{'TEXINPUTS'}) {
+    $ENV{'TEXINPUTS'} = absolutize_path($ENV{'TEXINPUTS'});
+}
+
 # Locate a file that's been "require"d.  Assumes that the file name of interest
 # is unique within the set of loaded files, after directory names have been
 # stripped.  Only the directory is returned.