X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=e8e44be0f41f4dc31b7d4467a674d6542f21592b;hb=4662123fd45a165ecf9ae4226c83215ba8d04913;hp=6748804f29bd4cf0f556c3f0d56804c52eb17dab;hpb=c1441fb686b2cfb7899000ba3a99564370691f30;p=p5sagit%2Flocal-lib.git

diff --git a/Makefile.PL b/Makefile.PL
index 6748804..e8e44be 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -19,6 +19,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;
@@ -30,10 +31,18 @@ BEGIN {
     system($^X, '-MCPAN', '-e',
       'CPAN::Config->load;
        unless (-w $CPAN::Config->{keep_source_where}) {
-         $ENV{PERL_MM_USE_DEFAULT} = 0;
          my $save = $CPAN::Config->{urllist};
          delete @{$CPAN::Config}{keys %$CPAN::Config};
          $CPAN::Config->{urllist} = $save;
+         my $orig = ExtUtils::MakeMaker->can("prompt");
+         my $done;
+         *ExtUtils::MakeMaker::prompt = sub {
+           if (!$done && $_[0] =~ /manual configuration/) {
+             $done++;
+             return "no";
+           }
+           return $orig->(@_);
+         };
          CPAN::Config->init;
        }'
     );