X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=f2907d057cffffc2a2c5651807fa4113cc1ba16a;hb=176d4afb15604cbd6f5a4e8126b2af7d3645eeb8;hp=0be48691c5c04a580a6d474ef1128bde78bdbbb8;hpb=da6e3c2d185931d7cb693b704e4b1522a50388ac;p=p5sagit%2Flocal-lib.git

diff --git a/Makefile.PL b/Makefile.PL
index 0be4869..f2907d0 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -112,7 +112,7 @@ DEATH
        # <mst> ExtUtils::ParseXS uses Module::Build
        # <mst> but Module::Build depends on it
        # <mst> so you need to set prefer_installer MM
-       # <mst> so cpan uses EU::ParseXS' Makefile.PL
+       # <mst> so cpan uses EU::ParseXS Makefile.PL
        # <mst> since we already got EUMM, *that* works
        $CPAN::Config->{prefer_installer} = "EUMM";
        CPAN::Config->load;
@@ -174,7 +174,7 @@ requires 'ExtUtils::MakeMaker' => '6.31'; # version INSTALL_BASE was added
 requires 'ExtUtils::Install' => '1.43'; # ditto
 requires 'ExtUtils::CBuilder'; # this and ParseXS are needed for MB C_support
 requires 'ExtUtils::ParseXS';
-requires 'Module::Build' => '0.28'; # lib -> lib/perl5 change
+requires 'Module::Build' => '0.36'; # PERL_MB_OPT
 my $required_CPAN = '1.82';
 requires 'CPAN' => $required_CPAN; # sudo support + CPAN::HandleConfig
 
@@ -204,13 +204,21 @@ delete $ENV{PERL5_CPAN_IS_RUNNING} if $no_cpan_env;
         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};
+                die <<"DEATH";
+WHOA THERE! It looks like you've got $CPAN::Config->{$eumm_setting} set. This is
+known to cause problems with local::lib. Please either remove this setting or
+clear out your .cpan directory.
+DEATH
             }
         }
 
         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};
+                die <<"DEATH";
+WHOA THERE! It looks like you've got $CPAN::Config->{$mb_setting} set. This is
+known to cause problems with local::lib. Please either remove this setting or
+clear out your .cpan directory.
+DEATH
             }
         }
     }