And the Changes file too. Whoops.

[p5sagit/local-lib.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 6748804..c5e6a21 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -9,7 +9,6 @@ BEGIN {
     $x =~ /^--bootstrap(?:=(.*))?$/;
     my @args = (defined $1 ? ($1) : ());
 
-    $ENV{PERL_MM_USE_DEFAULT} = 1;
     {
       local @INC = @INC;
       unshift(@INC, 'lib');
@@ -19,6 +18,7 @@ BEGIN {
     local::lib->import(@args);
 
     push(@ARGV,$ENV{PERL_MM_OPT});
+    push(@ARGV, map { "-I$_" } split(':',$ENV{PERL5LIB}));
 
     system($^X, '-MExtUtils::MakeMaker 6.31', '-e1');
     my $eumm = $? >> 8;
@@ -28,9 +28,17 @@ BEGIN {
     my $cpan_command = '';
 
     system($^X, '-MCPAN', '-e',
-      'CPAN::Config->load;
-       unless (-w $CPAN::Config->{keep_source_where}) {
-         $ENV{PERL_MM_USE_DEFAULT} = 0;
+      'my $done; require ExtUtils::MakeMaker;
+       my $orig = ExtUtils::MakeMaker->can("prompt");
+       *ExtUtils::MakeMaker::prompt = sub {
+         if (!$done && $_[0] =~ /manual configuration/) {
+           $done++;
+           return "no";
+         }
+         return $orig->(@_);
+       };
+       CPAN::Config->load;
+       unless ($done || -w $CPAN::Config->{keep_source_where}) {
          my $save = $CPAN::Config->{urllist};
          delete @{$CPAN::Config}{keys %$CPAN::Config};
          $CPAN::Config->{urllist} = $save;
@@ -38,6 +46,8 @@ BEGIN {
        }'
     );
 
+    $ENV{PERL_MM_USE_DEFAULT} = 1;
+
     # XXX - remove the force on EUMM once its test suite survive PERL_MM_OPT
 
     if ($eumm) { # non-zero exit