Upgrade to ExtUtils::MakeMaker 6.01.

[p5sagit/p5-mst-13.2.git] / lib / ExtUtils / MM_Win32.pm

diff --git a/lib/ExtUtils/MM_Win32.pm b/lib/ExtUtils/MM_Win32.pm
index 923f057..03af82e 100644 (file)
--- a/lib/ExtUtils/MM_Win32.pm
+++ b/lib/ExtUtils/MM_Win32.pm
@@ -29,7 +29,7 @@ use vars qw(@ISA $VERSION $BORLAND $GCC $DMAKE $NMAKE $PERLMAKE);
 require ExtUtils::MM_Any;
 require ExtUtils::MM_Unix;
 @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
-$VERSION = '1.04_01';
+$VERSION = '1.05';
 
 $ENV{EMXSHELL} = 'sh'; # to run `commands`
 
@@ -140,6 +140,14 @@ in these dirs:
     0; # false and not empty
 }
 
+
+# This code was taken out of MM_Unix to avoid loading File::Glob
+# unless necessary.
+sub find_tests {
+    return join(' ', <t\\*.t>);
+}
+
+
 sub init_others
 {
  my ($self) = @_;
@@ -182,13 +190,17 @@ sub constants {
     my(@m,$tmp);
 
     for $tmp (qw/
-
              AR_STATIC_ARGS NAME DISTNAME NAME_SYM VERSION
-             VERSION_SYM XS_VERSION INST_BIN INST_LIB
-             INST_ARCHLIB INST_SCRIPT PREFIX  INSTALLDIRS
-             INSTALLPRIVLIB INSTALLARCHLIB INSTALLSITELIB
-             INSTALLSITEARCH INSTALLBIN INSTALLSCRIPT PERL_LIB
-             PERL_ARCHLIB SITELIBEXP SITEARCHEXP LIBPERL_A MYEXTLIB
+             VERSION_SYM XS_VERSION 
+          INST_BIN INST_LIB INST_ARCHLIB INST_SCRIPT 
+          INSTALLDIRS
+          PREFIX          SITEPREFIX      VENDORPREFIX
+             INSTALLPRIVLIB  INSTALLSITELIB  INSTALLVENDORLIB
+             INSTALLARCHLIB  INSTALLSITEARCH INSTALLVENDORARCH
+          INSTALLBIN      INSTALLSITEBIN  INSTALLVENDORBIN  INSTALLSCRIPT 
+          PERL_LIB        PERL_ARCHLIB 
+          SITELIBEXP      SITEARCHEXP 
+          LIBPERL_A MYEXTLIB
              FIRST_MAKEFILE MAKE_APERL_FILE PERLMAINCC PERL_SRC
              PERL_INC PERL FULLPERL PERLRUN FULLPERLRUN PERLRUNINST 
           FULLPERLRUNINST ABSPERL ABSPERLRUN ABSPERLRUNINST
@@ -237,8 +249,10 @@ MAN3PODS = ".join(" \\\n\t", sort keys %{$self->{MAN3PODS}})."
 ";
 
     for $tmp (qw/
-             INST_MAN1DIR        INSTALLMAN1DIR MAN1EXT
-             INST_MAN3DIR        INSTALLMAN3DIR MAN3EXT
+             INST_MAN1DIR  MAN1EXT 
+          INSTALLMAN1DIR INSTALLSITEMAN1DIR INSTALLVENDORMAN1DIR
+             INST_MAN3DIR  MAN3EXT
+          INSTALLMAN3DIR INSTALLSITEMAN3DIR INSTALLVENDORMAN3DIR
              /) {
        next unless defined $self->{$tmp};
        push @m, "$tmp = $self->{$tmp}\n";
@@ -476,6 +490,7 @@ sub export_list
  return "$self->{BASEEXT}.def";
 }
 
+
 =item perl_script
 
 Takes one argument, a file name, and returns the file name, if the
@@ -513,7 +528,7 @@ pm_to_blib: $(TO_INST_PM)
 }. ($NMAKE ? q{
 $(PM_TO_BLIB)
 <<
-       } : '') . $self->{NOECHO}.q{$(TOUCH) $@
+       } : '') . "\t".$self->{NOECHO}.q{$(TOUCH) $@
 };
 }