From: Rafael Garcia-Suarez Date: Wed, 10 Mar 2004 09:25:36 +0000 (+0000) Subject: Change 22476 left out a similar fix for ExtUtils::MM_Win32 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=20e01b55fc81d1615fa9a7814d517ee31d896ff4;p=p5sagit%2Fp5-mst-13.2.git Change 22476 left out a similar fix for ExtUtils::MM_Win32 (noticed by Steve Hay.) Also, update MANIFEST.SKIP to be in line with the renaming "blibdirs" to "blibdirs.exists". p4raw-id: //depot/perl@22480 --- diff --git a/lib/ExtUtils/MANIFEST.SKIP b/lib/ExtUtils/MANIFEST.SKIP index 945b339..359c597 100644 --- a/lib/ExtUtils/MANIFEST.SKIP +++ b/lib/ExtUtils/MANIFEST.SKIP @@ -11,7 +11,7 @@ \bblib/ \bMakeMaker-\d \bpm_to_blib$ -\bblibdirs$ +\bblibdirs\.exists$ # Avoid Module::Build generated and utility files. \bBuild$ diff --git a/lib/ExtUtils/MM_Win32.pm b/lib/ExtUtils/MM_Win32.pm index 8636421..66a276e 100644 --- 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); require ExtUtils::MM_Any; require ExtUtils::MM_Unix; @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix ); -$VERSION = '1.10'; +$VERSION = '1.10_01'; $ENV{EMXSHELL} = 'sh'; # to run `commands` @@ -269,7 +269,7 @@ sub static_lib { my(@m); push(@m, <<'END'); -$(INST_STATIC): $(OBJECT) $(MYEXTLIB) blibdirs +$(INST_STATIC): $(OBJECT) $(MYEXTLIB) blibdirs.exists $(RM_RF) $@ END @@ -330,7 +330,7 @@ sub dynamic_lib { OTHERLDFLAGS = '.$otherldflags.' INST_DYNAMIC_DEP = '.$inst_dynamic_dep.' -$(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) blibdirs $(EXPORT_LIST) $(PERL_ARCHIVE) $(INST_DYNAMIC_DEP) +$(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) blibdirs.exists $(EXPORT_LIST) $(PERL_ARCHIVE) $(INST_DYNAMIC_DEP) '); if ($GCC) { push(@m,