diffs from apeiron

git-svn-id: http://dev.catalyst.perl.org/repos/bast/local-lib/1.000/trunk@3755 bd8105ee-0ff8-0310-8827-fb3f25b6796d

diff --git a/Makefile.PL b/Makefile.PL
index 6532653..3c41873 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -18,12 +18,22 @@ BEGIN {
     push(@ARGV,$ENV{PERL_MM_OPT});
 
     system($^X, '-MExtUtils::MakeMaker 6.31', '-e1');
-    my $r = $? >> 8;
+    my $eumm = $? >> 8;
+
+    system($^X, '-MCPAN 1.80', '-e1');
+    my $cpan = $? >> 8;
+    my $cpan_command = '';
 
     # XXX - remove the force on EUMM once its test suite survive PERL_MM_OPT
 
-    if ($r) { # non-zero exit
-      system($^X, '-MCPAN', '-e', 'force("install","ExtUtils::MakeMaker");');
+    if ($eumm) { # non-zero exit
+      $cpan_command .= 'force("install","ExtUtils::MakeMaker"); ';
+    }
+    if ($cpan) {
+      $cpan_command .= 'install("CPAN"); ';
+    }
+    if(length $cpan_command) {
+      system($^X, '-MCPAN', '-e', $cpan_command);
     }
 
   }
@@ -34,12 +44,6 @@ use inc::Module::Install;
 name 'local-lib';
 all_from 'lib/local/lib.pm';
 
-include('CPAN');
-include('CPAN::HandleConfig');
-include('CPAN::Debug');
-include('CPAN::Version');
-include('CPAN::Tarzip');
-
 requires 'ExtUtils::MakeMaker' => '6.31'; # version INSTALL_BASE was added
 requires 'ExtUtils::CBuilder'; # this and ParseXS are needed for MB C_support
 requires 'ExtUtils::ParseXS';