X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Flib_pm.PL;h=66b4944de507fd087701057ddd9140bf32692836;hb=32ce01bccb8e58ee340ca4100517f9c031630ea7;hp=0d2a73b842f1f20138ec649810c3f5b1f0a31245;hpb=4755096ec61711c5104ba0b6b9314f32ca0351fe;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/lib_pm.PL b/lib/lib_pm.PL
index 0d2a73b..66b4944 100644
--- a/lib/lib_pm.PL
+++ b/lib/lib_pm.PL
@@ -8,10 +8,30 @@ chdir dirname($0);
 my $file = basename($0, '.PL');
 $file =~ s!_(pm)$!.$1!i;
 
-my $Config_archname = defined($Config{'archname'}) ? $Config{'archname'} : '';
-my $Config_ver = defined($Config{'version'}) ? $Config{'version'} : '';
-my @Config_inc_version_list = defined($Config{'inc_version_list'}) ?
-  reverse split / /, $Config{'inc_version_list'} : ();
+my $useConfig;
+my $Config_archname;
+my $Config_version;
+my $Config_inc_version_list;
+
+# Expand the variables only if explicitly requested because
+# otherwise relocating Perl becomes much harder.
+
+if ($ENV{PERL_BUILD_EXPAND_CONFIG_VARS}) {
+    $useConfig = '';
+    $Config_archname = qq('$Config{archname}');
+    $Config_version  = qq('$Config{version}');
+    my @Config_inc_version_list =
+	reverse split / /, $Config{inc_version_list};
+    $Config_inc_version_list =
+	@Config_inc_version_list ?
+	    qq(@Config_inc_version_list) : q(());
+} else {
+    $useConfig = 'use Config;';
+    $Config_archname = q($Config{archname});
+    $Config_version  = q($Config{version});
+    $Config_inc_version_list =
+	      q(reverse split / /, qw($Config{inc_version_list}));
+}
  
 open OUT,">$file" or die "Can't create $file: $!";
  
@@ -23,11 +43,14 @@ 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.
+
+$useConfig
 
-my \$archname = "$Config_archname";
-my \$ver = "$Config_ver";
-my \@inc_version_list = qw(@Config_inc_version_list);
+my \$archname         = $Config_archname;
+my \$version          = $Config_version;
+my \@inc_version_list = $Config_inc_version_list;
 
 !GROK!THIS!
 print OUT <<'!NO!SUBS!';
@@ -56,8 +79,9 @@ sub import {
         }
 	# Put a corresponding archlib directory infront of $_ if it
 	# looks like $_ has an archlib directory below it.
-	unshift(@INC, "$_/$ver") if -d "$_/$ver";
-	unshift(@INC, "$_/$ver/$archname") if -d "$_/$ver/$archname";
+	unshift(@INC, "$_/$archname")          if -d "$_/$archname/auto";
+	unshift(@INC, "$_/$version")           if -d "$_/$version";
+	unshift(@INC, "$_/$version/$archname") if -d "$_/$version/$archname";
     }
 
     # remove trailing duplicates
@@ -72,7 +96,9 @@ sub unimport {
     my %names;
     foreach (@_) {
 	++$names{$_};
-	++$names{"$_/$archname"} if -d "$_/$archname/auto";
+	++$names{"$_/$archname"}          if -d "$_/$archname/auto";
+	++$names{"$_/$version"}           if -d "$_/$version";
+	++$names{"$_/$version/$archname"} if -d "$_/$version/$archname";
     }
 
     # Remove ALL instances of each named directory.