diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2008-02-08 13:25:18 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2008-02-08 13:25:18 +0000 |
| commit | d5ece4e2f6bab8ea3b566491297a9eefa412e671 (patch) | |
| tree | 3d82a913d09d03a10731d673c70c73a18312aa03 | |
| parent | ddd401edfb87653bbae61d29861bdb38843fadaf (diff) | |
| download | perl-d5ece4e2f6bab8ea3b566491297a9eefa412e671.tar.gz | |
Re-apply patches 32879, 32905, and 32964 to MakeMaker
p4raw-id: //depot/perl@33252
| -rw-r--r-- | lib/ExtUtils/MM_Unix.pm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm index 36ec6a1973..51951d4a75 100644 --- a/lib/ExtUtils/MM_Unix.pm +++ b/lib/ExtUtils/MM_Unix.pm @@ -15,7 +15,7 @@ use ExtUtils::MakeMaker qw($Verbose neatvalue); # If we make $VERSION an our variable parse_version() breaks use vars qw($VERSION); -$VERSION = '6.43_01'; +$VERSION = '6.43_02'; require ExtUtils::MM_Any; our @ISA = qw(ExtUtils::MM_Any); @@ -1979,6 +1979,9 @@ sub init_PERL { $self->{ABSPERL} = 'MCR '.$self->{ABSPERL} if $has_mcr; } + $self->{ABSPERL} = qq{"$self->{ABSPERL}"} + if ($self->{ABSPERL} =~ /\s/) && ! $has_mcr; + # Are we building the core? $self->{PERL_CORE} = $ENV{PERL_CORE} unless exists $self->{PERL_CORE}; $self->{PERL_CORE} = 0 unless defined $self->{PERL_CORE}; @@ -2448,7 +2451,7 @@ $(MAKE_APERL_FILE) : $(FIRST_MAKEFILE) pm_to_blib push @$extra, $_; } - grep(s/^(.*)/"-I$1"/, @{$perlinc || []}); + map(s/^(.*)/"-I$1"/, @{$perlinc || []}); $target ||= "perl"; $tmp ||= "."; |