Change 14298 by jhi@alpha on 2002/01/16 13:34:29
Subject: [PATCH] Tidy up EXE_EXT patches to MM_Unix.pm
From: "Green, Paul" <[EMAIL PROTECTED]>
Date: Tue, 15 Jan 2002 22:28:10 -0500
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
.... //depot/perl/lib/ExtUtils/MM_Unix.pm#140 edit
Differences ...
==== //depot/perl/lib/ExtUtils/MM_Unix.pm#140 (text) ====
Index: perl/lib/ExtUtils/MM_Unix.pm
--- perl/lib/ExtUtils/MM_Unix.pm.~1~ Wed Jan 16 06:45:05 2002
+++ perl/lib/ExtUtils/MM_Unix.pm Wed Jan 16 06:45:05 2002
@@ -11,7 +11,7 @@
our ($Is_Mac,$Is_OS2,$Is_VMS,$Is_Win32,$Is_Dos,
$Verbose,%pm,%static,$Xsubpp_Version);
-our $VERSION = '1.12606';
+our $VERSION = '1.12607';
require ExtUtils::MakeMaker;
ExtUtils::MakeMaker->import(qw($Verbose &neatvalue));
@@ -2027,21 +2027,20 @@
push @defpath, $component if defined $component;
}
- my @perls = ($self->canonpath($^X), 'perl', 'perl5', "perl$Config{version}");
+ # Build up a set of file names (not command names).
+ my $thisperl = $self->canonpath($^X);
+ $thisperl .= $Config{exe_ext} unless $thisperl =~ m/$Config{exe_ext}$/i;
+ my @perls = ('perl', 'perl5', "perl$Config{version}");
+ @perls = ($thisperl, (map $_.=$Config{exe_ext}, @perls));
- # miniperl has priority over all but the cannonical perl when in the
+ # miniperl has priority over all but the cannonical perl when in the
# core. Otherwise its a last resort.
+ my $miniperl = "miniperl$Config{exe_ext}";
if( $self->{PERL_CORE} ) {
- splice @perls, 1, 0, 'miniperl';
+ splice @perls, 1, 0, $miniperl;
}
else {
- push @perls, 'miniperl';
- }
-
- # Build up a set of file names (not command names).
- foreach $element (@perls) {
- $element .= $Config{exe_ext}
- unless $element =~ m/$Config{exe_ext}$/i;
+ push @perls, $miniperl;
}
$self->{PERL} ||=
End of Patch.
