From: Mattia Barbon Date: Sun, 7 Apr 2002 14:25:48 +0000 (+0200) Subject: [PATCH] MakeMaker basic.t on Win32 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=9b3032b7d9e3c8e820c1ad71015731661bd6d109;p=p5sagit%2Fp5-mst-13.2.git [PATCH] MakeMaker basic.t on Win32 From: "Mattia Barbon" Date: Sun, 7 Apr 2002 14:25:48 +0200 Message-ID: <3CB056EC.27101.1119A3D@localhost> Subject: [PATCH] MakeMaker && Win32 && nmake From: "Mattia Barbon" Date: Sun, 7 Apr 2002 14:25:48 +0200 Message-ID: <3CB056EC.9001.11199ED@localhost> p4raw-id: //depot/perl@15778 --- diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm index 9a51d07..f364344 100644 --- a/lib/ExtUtils/MM_Unix.pm +++ b/lib/ExtUtils/MM_Unix.pm @@ -1522,7 +1522,8 @@ sub init_main { foreach $dir ($Updir, File::Spec->catdir($Updir,$Updir), File::Spec->catdir($Updir,$Updir,$Updir), - File::Spec->catdir($Updir,$Updir,$Updir,$Updir)) + File::Spec->catdir($Updir,$Updir,$Updir,$Updir), + File::Spec->catdir($Updir,$Updir,$Updir,$Updir,$Updir)) { if ( -f File::Spec->catfile($dir,"config_h.SH") @@ -2862,7 +2863,7 @@ PERL_HDRS = \ $(PERL_INC)/warnings.h $(OBJECT) : $(PERL_HDRS) - } if $self->{OBJECT}; +} if $self->{OBJECT}; push @m, join(" ", values %{$self->{XS}})." : \$(XSUBPPDEPS)\n" if %{$self->{XS}}; diff --git a/lib/ExtUtils/MM_Win32.pm b/lib/ExtUtils/MM_Win32.pm index 2d8ccca..923f057 100644 --- a/lib/ExtUtils/MM_Win32.pm +++ b/lib/ExtUtils/MM_Win32.pm @@ -510,7 +510,7 @@ pm_to_blib: $(TO_INST_PM) : $DMAKE ? 'qw[ $(mktmp,pmfiles.dat $(PM_TO_BLIB:s,\\,\\\\,)\n) ],' : '{ qw[$(PM_TO_BLIB)] },' ).q{'}.$autodir.q{','$(PM_FILTER)')" - }. ($NMAKE ? q{ +}. ($NMAKE ? q{ $(PM_TO_BLIB) << } : '') . $self->{NOECHO}.q{$(TOUCH) $@