Change 20502: [PATCH] Re: MakeMaker doesn't pasthru DEFINE command-line args to subdirs on Win32

[Jarkko Hietaniemi]

Change 20502 by [EMAIL PROTECTED] on 2003/08/05 15:32:39

        Subject: [PATCH] Re: MakeMaker doesn't pasthru DEFINE command-line args to 
subdirs on Win32
        From: Steve Hay <[EMAIL PROTECTED]>
        Date: Tue, 05 Aug 2003 10:43:49 +0100
        Message-ID: <[EMAIL PROTECTED]>
        
        (The MM_Unix.pm part was dealt with in #20501.)

Affected files ...

... //depot/perl/lib/ExtUtils/MM_Win32.pm#47 edit
... //depot/perl/lib/ExtUtils/t/MM_Win32.t#10 edit

Differences ...

==== //depot/perl/lib/ExtUtils/MM_Win32.pm#47 (text) ====
Index: perl/lib/ExtUtils/MM_Win32.pm
--- perl/lib/ExtUtils/MM_Win32.pm#46~20022~     Sun Jul  6 00:26:52 2003
+++ perl/lib/ExtUtils/MM_Win32.pm       Tue Aug  5 08:32:39 2003
@@ -430,8 +430,10 @@
 
 sub pasthru {
     my($self) = shift;
-    return "PASTHRU = " . ($NMAKE ? "-nologo" : "");
-}
+    my $pasthru = $self->SUPER::pasthru();
+    $pasthru =~ s/PASTHRU\s*=\s*/PASTHRU = -nologo / if $NMAKE;
+    return $pasthru;                                                           
+ }
 
 
 =item oneliner (o)

==== //depot/perl/lib/ExtUtils/t/MM_Win32.t#10 (text) ====
Index: perl/lib/ExtUtils/t/MM_Win32.t
--- perl/lib/ExtUtils/t/MM_Win32.t#9~19099~     Mon Mar 31 01:54:52 2003
+++ perl/lib/ExtUtils/t/MM_Win32.t      Tue Aug  5 08:32:39 2003
@@ -254,8 +254,8 @@
 
 # pasthru()
 {
-    my $pastru = "PASTHRU = " . ($Config{make} =~ /^nmake/i ? "-nologo" : "");
-    is( $MM->pasthru(), $pastru, 'pasthru()' );
+    my $pasthru = ($Config{make} =~ /^nmake/i ? "/-nologo/" : "");
+    like( $MM->pasthru(), $pasthru, 'pasthru()' );
 }
 
 package FakeOut;
End of Patch.