X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Flib_pm.PL;h=bb02106058730a8472feff63d24b5a1ee19209b5;hb=427f4adb1817daf51d5b7762a1ebb87394ca8ac8;hp=0d2a73b842f1f20138ec649810c3f5b1f0a31245;hpb=d57281c6627af64e586faee361d0194bbbc3e41f;p=p5sagit%2Fp5-mst-13.2.git

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.