X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=3dea5bf288828cb6f5328d5c3a063bff226f336d;hb=b143d045389639ccd7aa236efb67b5cbfe65773e;hp=cf1ec5c233b43f08ed2b3217321f71d056c6138e;hpb=d4dbe584d4fb4bc6c179801ae4aa5c6b7f55f157;p=p5sagit%2Flocal-lib.git

diff --git a/Makefile.PL b/Makefile.PL
index cf1ec5c..3dea5bf 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,8 +1,13 @@
 use strict;
 use warnings;
-use vars qw($bootstrapping);
+use File::Spec;
+use Cwd;
+use vars qw($bootstrapping $bootstrapping_args);
+use Config;
 
+my $cwd;
 BEGIN {
+  $cwd = Cwd::cwd();
   # watch out for fancy dashes. these can wind up in our @ARGV if the user is
   # copypasting the bootstrap command from the POD displayed e.g. by perldoc
   # on a Mac OS X terminal. since no software recognizes and handles these
@@ -22,8 +27,8 @@ DEATH
   if (my ($x) = grep { /^--bootstrap(?:=.*)?$/ } @ARGV) {
     @ARGV = grep { !/^--bootstrap(?:=.*)?$/ } @ARGV;
     $bootstrapping = 1;
-    $x =~ /^--bootstrap(?:=(.*))?$/;
-    my @args = (defined $1 ? ($1) : ());
+    my ($path) = $x =~ /^--bootstrap(?:=(.*))?$/;
+    my @args = $path ? $path : ();
 
     {
       local @INC = @INC;
@@ -33,8 +38,10 @@ DEATH
 
     local::lib->import(@args);
 
+    my @libs = map { "-I$_" } split $Config{path_sep}, $ENV{PERL5LIB};
+    $bootstrapping_args = "@libs";
     push(@ARGV,$ENV{PERL_MM_OPT});
-    push(@ARGV, map { "-I$_" } split(':',$ENV{PERL5LIB}));
+    push(@ARGV, @libs);
 
     system($^X, '-MExtUtils::MakeMaker 6.31', '-e1');
     my $eumm = $? >> 8;
@@ -46,7 +53,7 @@ DEATH
     system($^X, '-MCPAN', '-e',
       'my $done; require ExtUtils::MakeMaker;
        my $orig = ExtUtils::MakeMaker->can("prompt");
-       *ExtUtils::MakeMaker::prompt = sub {
+       *ExtUtils::MakeMaker::prompt = sub ($;$) {
          if (!$done && $_[0] =~ /manual configuration/) {
            $done++;
            return "no";
@@ -78,6 +85,8 @@ DEATH
     if ($cpan) {
       system($^X, '-MCPAN', '-e', 'CPAN::Config->load; CPAN::Config->commit;');
     }
+
+    chdir($cwd);
   }
 }
 
@@ -99,13 +108,35 @@ requires 'CPAN' => '1.80'; # sudo support
 # without this beautiful hack
 
 my $no_cpanplus_env = !exists $ENV{PERL5_CPANPLUS_IS_RUNNING};
+my $no_cpan_env = !exists $ENV{PERL5_CPAN_IS_RUNNING};
 require CPAN;
 delete $ENV{PERL5_CPANPLUS_IS_RUNNING} if $no_cpanplus_env;
+delete $ENV{PERL5_CPAN_IS_RUNNING} if $no_cpan_env;
+
+# and make sure that the user doesn't have any existing CPAN config that'll
+# cause us problems for the next few steps.
+require CPAN::HandleConfig;
+CPAN::HandleConfig->load;
+for my $eumm_setting ( qw/makepl_arg make_install_arg/ ) {
+    if ($CPAN::Config->{$eumm_setting} =~ /(?:PREFIX|INSTALL_BASE)/) {
+        die "Possibly invalid config detected in $eumm_setting: " . $CPAN::Config->{$eumm_setting};
+    }
+}
+
+for my $mb_setting (qw/mbuild_arg mbuild_install_arg mbuildpl_arg/) {
+    if ($CPAN::Config->{$mb_setting} =~ /(?:--prefix|--install_base)/) {
+        die "Possibly invalid config detected in $mb_setting: " . $CPAN::Config->{$mb_setting};
+    }
+}
 
 if ($bootstrapping) {
   auto_install_now;
+  postamble <<"END";
+PERL     += $bootstrapping_args
+FULLPERL += $bootstrapping_args
+END
 } else {
   auto_install;
 }
-
+chdir($cwd);
 WriteAll;