From: Tim Conrow <tim@spindrift.srl.caltech.edu>
Date: Thu, 3 Aug 2000 14:29:21 +0000 (-0700)
Subject: [ID 20000803.006] 'use lib ...' doesn't behave as documented
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=427f4adb1817daf51d5b7762a1ebb87394ca8ac8;p=p5sagit%2Fp5-mst-13.2.git

[ID 20000803.006] 'use lib ...' doesn't behave as documented
Message-Id: <200008032129.OAA27898@spindrift.caltech.edu>

p4raw-id: //depot/perl@6538
---

diff --git a/lib/lib_pm.PL b/lib/lib_pm.PL
index 0d2a73b..bb02106 100644
--- a/lib/lib_pm.PL
+++ b/lib/lib_pm.PL
@@ -23,7 +23,8 @@ print "Extracting $file (with variable substitutions)\n";
 print OUT <<"!GROK!THIS!";
 package lib;
 
-use 5.005_64;
+# THIS FILE IS AUTOMATICALLY GENERATED FROM lib_pm.PL.
+# ANY CHANGES TO THIS FILE WILL BE OVERWRITTEN BY THE NEXT PERL BUILD.
 
 my \$archname = "$Config_archname";
 my \$ver = "$Config_ver";
@@ -56,6 +57,7 @@ sub import {
         }
 	# Put a corresponding archlib directory infront of $_ if it
 	# looks like $_ has an archlib directory below it.
+	unshift(@INC, "$_/$archname") if -d "$_/$archname/auto";
 	unshift(@INC, "$_/$ver") if -d "$_/$ver";
 	unshift(@INC, "$_/$ver/$archname") if -d "$_/$ver/$archname";
     }
@@ -73,6 +75,8 @@ sub unimport {
     foreach (@_) {
 	++$names{$_};
 	++$names{"$_/$archname"} if -d "$_/$archname/auto";
+	++$names{"$_/$ver"} if -d "$_/$ver";
+	++$names{"$_/$ver/$archname"} if -d "$_/$ver/$archname";
     }
 
     # Remove ALL instances of each named directory.