X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Flib.pm;h=e46c5fefa61f81ed1ea0efce10f9ca8cb0594043;hb=c1c69de66de53cee7ab2bd05b0117a707d3ae7ff;hp=afc979bb451ce2bc2238c497fd7c5937620aeb6b;hpb=146174a91a192983720a158796dc066226ad0e55;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/lib.pm b/lib/lib.pm
index afc979b..e46c5fe 100644
--- a/lib/lib.pm
+++ b/lib/lib.pm
@@ -1,13 +1,14 @@
 package lib;
 
-use vars qw(@ORIG_INC);
+use 5.005_64;
 use Config;
 
 my $archname = $Config{'archname'};
 my $ver = $Config{'version'};
+my @inc_version_list = reverse split / /, $Config{'inc_version_list'};
 
-@ORIG_INC = @INC;	# take a handy copy of 'original' value
-
+our @ORIG_INC = @INC;	# take a handy copy of 'original' value
+our $VERSION = '0.5564';
 
 sub import {
     shift;
@@ -23,12 +24,15 @@ sub import {
 	    Carp::carp("Parameter to use lib must be directory, not file");
 	}
 	unshift(@INC, $_);
+        # Add any previous version directories we found at configure time
+        foreach my $incver (@inc_version_list)
+        {
+            unshift(@INC, "$_/$incver") if -d "$_/$incver";
+        }
 	# Put a corresponding archlib directory infront of $_ if it
 	# looks like $_ has an archlib directory below it.
-	if (-d "$_/$archname") {
-	    unshift(@INC, "$_/$archname")    if -d "$_/$archname/auto";
-	    unshift(@INC, "$_/$archname/$ver") if -d "$_/$archname/$ver/auto";
-	}
+	unshift(@INC, "$_/$ver") if -d "$_/$ver";
+	unshift(@INC, "$_/$ver/$archname") if -d "$_/$ver/$archname";
     }
 
     # remove trailing duplicates