X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=570e3620e5e6a27b97251f111d9b8f493256ea28;hb=c4e3c83b39395335191f82b48c429da2c42f1fbc;hp=8c4802b5fb6f68c0695316e2e201e889d1f33c54;hpb=1c9cde8ea186150ec281586cc0685641d205ea27;p=p5sagit%2Flocal-lib.git

diff --git a/Makefile.PL b/Makefile.PL
index 8c4802b..570e362 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -28,7 +28,7 @@ if(exists $ENV{PERL_LL_TAR}) {
   $have_gtar ||= -x $ENV{PERL_LL_TAR};
 }
 
-die <<'DEATH' unless $has_gtar;
+die <<'DEATH' unless $have_gtar;
 You are using Solaris (or another traditional Unix) that does not provide a sane
 tar, capable of dealing with the output of GNU tar. Please either set the
 PERL_LL_TAR environment variable to the location of a version of tar that
@@ -102,7 +102,8 @@ DEATH
          }
          return $orig->(@_);
        };
-       $CPAN::Config->{urllist} = ["http://cpan.shadowcatprojects.net"];
+       # not yet -- apeiron, 2010-03-10 
+       #$CPAN::Config->{urllist} = ["http://cpan.shadowcatprojects.net"];
        # <mst> all bootstrapped fine on one DH account
        # <mst> on another, it tries to install man stuff into /usr/local
        # <mst> cannot for the life of me figure out why
@@ -111,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;
@@ -203,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
             }
         }
     }