dist/ExtUtils-Install: Skip tests if make is not available

diff --git a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm b/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
index 93afb0d..378c00e 100644 (file)
--- a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
+++ b/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
@@ -38,11 +38,11 @@ ExtUtils::Install - install files from here to there
 
 =head1 VERSION
 
-1.61
+1.62
 
 =cut
 
-$VERSION = '1.61';  # <-- do not forget to update the POD section just above this line!
+$VERSION = '1.62';  # <-- do not forget to update the POD section just above this line!
 $VERSION = eval $VERSION;
 
 =pod

diff --git a/dist/ExtUtils-Install/lib/ExtUtils/Installed.pm b/dist/ExtUtils-Install/lib/ExtUtils/Installed.pm
index c267d99..4d6ba6b 100644 (file)
--- a/dist/ExtUtils-Install/lib/ExtUtils/Installed.pm
+++ b/dist/ExtUtils-Install/lib/ExtUtils/Installed.pm
@@ -17,7 +17,7 @@ my $DOSISH = ($^O =~ /^(MSWin\d\d|os2|dos|mint)$/);
 require VMS::Filespec if $Is_VMS;
 
 use vars qw($VERSION);
-$VERSION = '1.999003';
+$VERSION = '1.999004';
 $VERSION = eval $VERSION;
 
 sub _is_prefix {

diff --git a/dist/ExtUtils-Install/lib/ExtUtils/Packlist.pm b/dist/ExtUtils-Install/lib/ExtUtils/Packlist.pm
index a268e30..2d60b25 100644 (file)
--- a/dist/ExtUtils-Install/lib/ExtUtils/Packlist.pm
+++ b/dist/ExtUtils-Install/lib/ExtUtils/Packlist.pm
@@ -5,7 +5,7 @@ use strict;
 use Carp qw();
 use Config;
 use vars qw($VERSION $Relocations);
-$VERSION = '1.46';
+$VERSION = '1.47';
 $VERSION = eval $VERSION;
 
 # Used for generating filehandle globs.  IO::File might not be available!

diff --git a/dist/ExtUtils-Install/t/InstallWithMM.t b/dist/ExtUtils-Install/t/InstallWithMM.t
index 0d58d3c..72252d0 100644 (file)
--- a/dist/ExtUtils-Install/t/InstallWithMM.t
+++ b/dist/ExtUtils-Install/t/InstallWithMM.t
@@ -10,19 +10,26 @@ use strict;
 use Config;
 use ExtUtils::MakeMaker;
 
+use Test::More;
 use MakeMaker::Test::Utils;
+
+my $make;
+BEGIN {
+    $make = make_run();
+    if (!$make) {
+       plan skip_all => "make isn't available";
+    }
+    else {
+       plan tests => 15;
+    }
+}
+
 use MakeMaker::Test::Setup::BFD;
 use IPC::Cmd qw(can_run);
-use Test::More
-    can_run(make())
-    ? (tests => 15)
-    : (skip_all => "make not available");
 use File::Find;
 use File::Spec;
 use File::Path;
 
-my $make = make_run();
-
 # Environment variables which interfere with our testing.
 delete @ENV{qw(PREFIX LIB MAKEFLAGS)};
 

diff --git a/dist/ExtUtils-Install/t/lib/MakeMaker/Test/Utils.pm b/dist/ExtUtils-Install/t/lib/MakeMaker/Test/Utils.pm
index 453a8ed..f80a6cd 100644 (file)
--- a/dist/ExtUtils-Install/t/lib/MakeMaker/Test/Utils.pm
+++ b/dist/ExtUtils-Install/t/lib/MakeMaker/Test/Utils.pm
@@ -4,6 +4,8 @@ use File::Spec;
 use strict;
 use Config;
 
+use IPC::Cmd qw(can_run);
+
 require Exporter;
 our @ISA = qw(Exporter);
 
@@ -210,6 +212,7 @@ sub make {
     my $make = $Config{make};
     $make = $ENV{MAKE} if exists $ENV{MAKE};
 
+    return if !can_run($make);
     return $make;
 }
 
@@ -223,6 +226,7 @@ Returns the make to run as with make() plus any necessary switches.
 
 sub make_run {
     my $make = make;
+    return if !$make;
     $make .= ' -nologo' if $make eq 'nmake';
 
     return $make;