MM_W95.pm, Win95 + MinGW + dmake

From: "Mattia Barbon" <mbarbon@dsi.unive.it>
Message-ID: <3D2C8151.30381.12DE80@localhost>

p4raw-id: //depot/perl@17469

diff --git a/lib/ExtUtils/MM_Win95.pm b/lib/ExtUtils/MM_Win95.pm
index a6eddae..010900f 100644 (file)
--- a/lib/ExtUtils/MM_Win95.pm
+++ b/lib/ExtUtils/MM_Win95.pm
@@ -5,7 +5,7 @@ $VERSION = 0.02;
 
 require ExtUtils::MM_Win32;
 @ISA = qw(ExtUtils::MM_Win32);
-
+use Config;
 
 =head1 NAME
 
@@ -26,11 +26,11 @@ sub dist_test {
     my($self) = shift;
     return q{
 disttest : distdir
-        cd $(DISTVNAME)
-        $(ABSPERLRUN) Makefile.PL
-        $(MAKE) $(PASTHRU)
-        $(MAKE) test $(PASTHRU)
-        cd ..
+       cd $(DISTVNAME)
+       $(ABSPERLRUN) Makefile.PL
+       $(MAKE) $(PASTHRU)
+       $(MAKE) test $(PASTHRU)
+       cd ..
 };
 }
 
@@ -58,6 +58,8 @@ sub xs_cpp {
 sub xs_o {
     my($self) = shift;
     return '' unless $self->needs_linking();
+    # having to choose between .xs -> .c -> .o and .xs -> .o confuses dmake
+    return '' if $Config{make} eq 'dmake';
     '
 .xs$(OBJ_EXT):
        $(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) $(XSUBPP) \\