Upgrade to MakeMaker 6.10_07 (from makemaker.org snapshot

as of 2003-06-19 18:39 EET).

p4raw-id: //depot/perl@19820

8 files changed, 24 insertions, 19 deletions

diff --git a/lib/ExtUtils/MM_Any.pm b/lib/ExtUtils/MM_Any.pm
index f7cb4e87ac..6a31d55e5c 100644
--- a/lib/ExtUtils/MM_Any.pm
+++ b/lib/ExtUtils/MM_Any.pm
@@ -490,7 +490,7 @@ installation.
 sub libscan {
     my($self,$path) = @_;
     my($dirs,$file) = ($self->splitpath($path))[1,2];
-    return '' if grep /^RCS|CVS|SCCS|\.svn$/, 
+    return '' if grep /^(?:RCS|CVS|SCCS|\.svn)$/, 
                      $self->splitdir($dirs), $file;
 
     return $path;
diff --git a/lib/ExtUtils/MM_OS2.pm b/lib/ExtUtils/MM_OS2.pm
index 656daa57ef..b85a007599 100644
--- a/lib/ExtUtils/MM_OS2.pm
+++ b/lib/ExtUtils/MM_OS2.pm
@@ -130,9 +130,9 @@ sub init_linker {
 
     $self->{PERL_ARCHIVE} = "\$(PERL_INC)/libperl\$(LIB_EXT)";
 
-    $self->{PERL_ARCHIVE_AFTER} = !$OS2::is_aout 
-      ? "\$(PERL_INC)/libperl_override\$(LIB_EXT)"
-      : '';
+    $self->{PERL_ARCHIVE_AFTER} = $OS2::is_aout
+      ? ''
+      : '$(PERL_INC)/libperl_override$(LIB_EXT)';
     $self->{EXPORT_LIST} = '$(BASEEXT).def';
 }
 
diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
index a17ca91382..bdf26ede94 100644
--- a/lib/ExtUtils/MM_Unix.pm
+++ b/lib/ExtUtils/MM_Unix.pm
@@ -792,7 +792,7 @@ sub dist_target {
 
     my $date_check = $self->oneliner(<<'CODE', ['-l']);
 print 'Warning: Makefile possibly out of date with $(VERSION_FROM)'
-  if -e '$(VERSION_FROM)' and -M '$(VERSION_FROM)' < -M '$(FIRST_MAKEFILE)';
+    if -e '$(VERSION_FROM)' and -M '$(VERSION_FROM)' < -M '$(FIRST_MAKEFILE)';
 CODE
 
     return sprintf <<'MAKE_FRAG', $date_check;
@@ -2591,8 +2591,7 @@ EXE_FILES = @{$self->{EXE_FILES}}
 
 } . ($Is_Win32
   ? q{FIXIN = pl2bat.bat
-} : q{FIXIN = $(PERLRUN) "-MExtUtils::MY" \
-    -e "MY->fixin(shift)"
+} : q{FIXIN = $(PERLRUN) "-MExtUtils::MY" -e "MY->fixin(shift)"
 }).qq{
 pure_all :: @to
 	\$(NOECHO) \$(NOOP)
@@ -3566,7 +3565,8 @@ sub oneliner {
     $cmd =~ s{^\n+}{};
     $cmd =~ s{\n+$}{};
 
-    $cmd = $self->quote_literal($cmd);
+    my @cmds = split /\n/, $cmd;
+    $cmd = join "\n\t-e ", map $self->quote_literal($_), @cmds;
     $cmd = $self->escape_newlines($cmd);
 
     $switches = join ' ', @$switches;
diff --git a/lib/ExtUtils/MM_VMS.pm b/lib/ExtUtils/MM_VMS.pm
index 7b2b216f7f..c261957718 100644
--- a/lib/ExtUtils/MM_VMS.pm
+++ b/lib/ExtUtils/MM_VMS.pm
@@ -21,7 +21,7 @@ BEGIN {
 use File::Basename;
 use vars qw($Revision @ISA $VERSION);
 ($VERSION) = '5.67';
-($Revision) = q$Revision: 1.95 $ =~ /Revision:\s+(\S+)/;
+($Revision) = q$Revision: 1.97 $ =~ /Revision:\s+(\S+)/;
 
 require ExtUtils::MM_Any;
 require ExtUtils::MM_Unix;
diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
index c824844db6..378640cf73 100644
--- a/lib/ExtUtils/MakeMaker.pm
+++ b/lib/ExtUtils/MakeMaker.pm
@@ -2,8 +2,8 @@ package ExtUtils::MakeMaker;
 
 BEGIN {require 5.005_03;}
 
-$VERSION = '6.10_05';
-($Revision) = q$Revision: 1.115 $ =~ /Revision:\s+(\S+)/;
+$VERSION = '6.10_07';
+($Revision) = q$Revision: 1.117 $ =~ /Revision:\s+(\S+)/;
 
 require Exporter;
 use Config;
@@ -2029,7 +2029,7 @@ MakeMaker object. The following lines will be parsed o.k.:
 
     $VERSION = '1.00';
     *VERSION = \'1.01';
-    $VERSION = sprintf "%d.%03d", q$Revision: 1.115 $ =~ /(\d+)/g;
+    $VERSION = sprintf "%d.%03d", q$Revision: 1.117 $ =~ /(\d+)/g;
     $FOO::VERSION = '1.10';
     *FOO::VERSION = \'1.11';
     our $VERSION = 1.2.3;       # new for perl5.6.0 
diff --git a/lib/ExtUtils/t/Command.t b/lib/ExtUtils/t/Command.t
index 7f1a97c726..4e54189b90 100644
--- a/lib/ExtUtils/t/Command.t
+++ b/lib/ExtUtils/t/Command.t
@@ -31,11 +31,14 @@ BEGIN {
 }
 
 {
-    # get a file in the current directory, replace last char with wildcard 
+    # get a file in the MM test directory, replace last char with wildcard 
     my $file;
     {
         local *DIR;
-        opendir(DIR, File::Spec->curdir());
+        my $mmtestdir = $ENV{PERL_CORE}
+          ? File::Spec->catdir(File::Spec->updir, 'lib', 'ExtUtils', 't')
+          : File::Spec->curdir;
+        opendir(DIR, $mmtestdir);
         while ($file = readdir(DIR)) {
             $file =~ s/\.\z// if $^O eq 'VMS';
             last if $file =~ /^\w/;
diff --git a/lib/ExtUtils/t/MM_OS2.t b/lib/ExtUtils/t/MM_OS2.t
index ae3b79ebde..c09f68a447 100644
--- a/lib/ExtUtils/t/MM_OS2.t
+++ b/lib/ExtUtils/t/MM_OS2.t
@@ -259,12 +259,13 @@ is( $mm->{PERL_ARCHIVE}, '$(PERL_INC)/libperl$(LIB_EXT)', 'PERL_ARCHIVE' );
 	local *OS2::is_aout;
 	*OS2::is_aout = \$aout;
 	
-    $mm->init_linker;
+        $mm->init_linker;
 	isnt( $mm->{PERL_ARCHIVE_AFTER}, '',
 		'PERL_ARCHIVE_AFTER should be empty without $is_aout set' );
 	$aout = 1;
-	is( $mm->{PERL_ARCHIVE_AFTER}, '$(PERL_INC)/libperl_override$(LIB_EXT)', 
-		'... and `$(PERL_INC)/libperl_override$(LIB_EXT)\' if it is set' );
+	is( $mm->{PERL_ARCHIVE_AFTER}, 
+            '$(PERL_INC)/libperl_override$(LIB_EXT)', 
+		'... and has libperl_override if it is set' );
 }
 
 # EXPORT_LIST
diff --git a/lib/ExtUtils/t/MM_Unix.t b/lib/ExtUtils/t/MM_Unix.t
index 1e0e801754..3c1dc9836c 100644
--- a/lib/ExtUtils/t/MM_Unix.t
+++ b/lib/ExtUtils/t/MM_Unix.t
@@ -18,7 +18,7 @@ BEGIN {
         plan skip_all => 'Non-Unix platform';
     }
     else {
-        plan tests => 115;
+        plan tests => 116;
     }
 }
 
@@ -167,7 +167,8 @@ is ($t->libscan('foo/RCS/bar'),     '', 'libscan on RCS');
 is ($t->libscan('CVS/bar/car'),     '', 'libscan on CVS');
 is ($t->libscan('SCCS'),            '', 'libscan on SCCS');
 is ($t->libscan('.svn/something'),  '', 'libscan on Subversion');
-is ($t->libscan('foo/b~r'),         'foo/b~r', 'libscan on file with ~');
+is ($t->libscan('foo/b~r'),         'foo/b~r',    'libscan on file with ~');
+is ($t->libscan('foo/RCS.pm'),      'foo/RCS.pm', 'libscan on file with RCS');
 
 is ($t->libscan('Fatty'), 'Fatty', 'libscan on something not a VC file' );