adjust csh output to allow use directly by eval

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

diff --git a/Makefile.PL b/Makefile.PL
index b3f07e4..e0a0f2e 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -83,7 +83,7 @@ DEATH
     # <mst> we must set PERL_AUTOINSTALL_PREFER_CPAN too
     $ENV{PERL_AUTOINSTALL_PREFER_CPAN} = 1;
 
-    system($^X, '-MExtUtils::MakeMaker 6.31', '-e1');
+    system($^X, '-MExtUtils::MakeMaker 6.74', '-e1');
     my $eumm = $? >> 8;
 
     system($^X, '-MExtUtils::Install 1.43', '-e1');
@@ -181,8 +181,8 @@ use inc::Module::Install;
 name 'local-lib';
 all_from 'lib/local/lib.pm';
 
-requires 'ExtUtils::MakeMaker' => '6.31'; # version INSTALL_BASE was added
-requires 'ExtUtils::Install' => '1.43'; # ditto
+requires 'ExtUtils::MakeMaker' => '6.74'; # version PERL_MM_OPT is shell parsed
+requires 'ExtUtils::Install' => '1.43'; # version INSTALL_BASE was added
 requires 'Module::Build' => '0.36'; # PERL_MB_OPT
 
 # don't bother fixing CPAN.pm if bootstrapped from cpanminus
@@ -217,9 +217,9 @@ unless ($ENV{PERL5_CPANM_IS_RUNNING}) {
             for my $eumm_setting ( qw/makepl_arg make_install_arg/ ) {
                 if ($CPAN::Config->{$eumm_setting} =~ /(?:PREFIX|INSTALL_BASE)/) {
                     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.
+WHOA THERE! It looks like you've got $CPAN::Config->{$eumm_setting} set in
+your CPAN config. This is known to cause problems with local::lib. Please
+either remove this setting or clear out your .cpan directory.
 DEATH
                 }
             }
@@ -227,9 +227,9 @@ DEATH
             for my $mb_setting (qw/mbuild_arg mbuild_install_arg mbuildpl_arg/) {
                 if ($CPAN::Config->{$mb_setting} =~ /(?:--prefix|--install_base)/) {
                     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.
+WHOA THERE! It looks like you've got $CPAN::Config->{$mb_setting} set in
+your CPAN config. This is known to cause problems with local::lib. Please
+either remove this setting or clear out your .cpan directory.
 DEATH
                 }
             }