From 6383bd231af7f2656c299fa25c460180b9bf54b4 Mon Sep 17 00:00:00 2001 From: Steve Hay Date: Wed, 27 Apr 2005 08:35:40 +0000 Subject: [PATCH] Win32 MM test fix From: Michael G Schwern Date: Mon, 18 Apr 2005 14:30:19 -0700 Message-ID: <20050418213019.GA15797@windhund.schwern.org> Subject: Re: Win32 MM test fix From: demerphq Date: Tue, 19 Apr 2005 00:57:59 +0200 Message-ID: <9b18b31105041815573e10dc10@mail.gmail.com> p4raw-id: //depot/perl@24334 --- lib/ExtUtils/MM_Unix.pm | 3 ++- lib/ExtUtils/MM_Win32.pm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm index 4e4326d5fb0c..34fec38db7bc 100644 --- a/lib/ExtUtils/MM_Unix.pm +++ b/lib/ExtUtils/MM_Unix.pm @@ -1921,7 +1921,8 @@ sub init_PERL { } # Are we building the core? - $self->{PERL_CORE} = 0 unless exists $self->{PERL_CORE}; + $self->{PERL_CORE} = $ENV{PERL_CORE} unless exists $self->{PERL_CORE}; + $self->{PERL_CORE} = 0 unless defined $self->{PERL_CORE}; # How do we run perl? foreach my $perl (qw(PERL FULLPERL ABSPERL)) { diff --git a/lib/ExtUtils/MM_Win32.pm b/lib/ExtUtils/MM_Win32.pm index 3839c2404242..5e7f8e5f7670 100644 --- a/lib/ExtUtils/MM_Win32.pm +++ b/lib/ExtUtils/MM_Win32.pm @@ -168,7 +168,7 @@ sub init_others { $self->{DEV_NULL} ||= '> NUL'; $self->{FIXIN} ||= $self->{PERL_CORE} ? - '$(PERLRUN) ../../win32/bin/pl2bat.pl' : + "\$(PERLRUN) $self->{PERL_SRC}/win32/bin/pl2bat.pl" : 'pl2bat.bat'; $self->{LD} ||= $Config{ld} || 'link';