diff options
| author | Steve Hay <SteveHay@planit.com> | 2004-03-15 10:28:02 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2004-03-15 17:09:26 +0000 |
| commit | 6c85d12ec38b94bb586518d2d22725f3b0437ad5 (patch) | |
| tree | 208c54e4e176576f1594afa69667b35b2e50843b /win32/Makefile | |
| parent | db7334812f997133352bcd8e8b49bce918e13370 (diff) | |
| download | perl-6c85d12ec38b94bb586518d2d22725f3b0437ad5.tar.gz | |
Re: Smoke [5.9.1] 22491 FAIL(M) MSWin32 WinXP/.Net SP1 (x86/1 cpu)
Message-ID: <40558532.30002@uk.radan.com>
Plus, restore patch #22489
p4raw-id: //depot/perl@22501
Diffstat (limited to 'win32/Makefile')
| -rw-r--r-- | win32/Makefile | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/win32/Makefile b/win32/Makefile index d84b4a855f..5483b7494b 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -962,11 +962,16 @@ $(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs Extensions: buildext.pl $(PERLDEP) $(CONFIGPM) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) +# Note: The next two targets explicitly remove a "blibdirs.exists" file that +# currerntly gets left behind, until CPAN RT Ticket #5616 is resolved. + Extensions_clean: -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) clean + -if exist $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists del /f $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists Extensions_realclean: -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) realclean + -if exist $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists del /f $(EXTDIR)\SDBM_File\sdbm\blibdirs.exists #---------------------------------------------------------------------------------- @@ -1124,13 +1129,13 @@ inst_lib : $(CONFIGPM) $(RCOPY) ..\lib $(INST_LIB)\*.* minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) utils - $(XCOPY) $(MINIPERL) ..\t\perl.exe + $(XCOPY) $(MINIPERL) ..\t\$(NULL) + if exist ..\t\perl.exe del /f ..\t\perl.exe + rename ..\t\miniperl.exe perl.exe $(XCOPY) $(GLOBEXE) ..\t\$(NULL) attrib -r ..\t\*.* - copy test ..\t - cd ..\t - $(MINIPERL) -I..\lib test base/*.t comp/*.t cmd/*.t io/*.t op/*.t pragma/*.t - cd ..\win32 + cd ..\t && \ + $(MINIPERL) -I..\lib harness base/*.t comp/*.t cmd/*.t io/*.t op/*.t pragma/*.t test-prep : all utils $(XCOPY) $(PERLEXE) ..\t\$(NULL) |