diff options
| author | Steve Hay <SteveHay@planit.com> | 2004-06-01 16:30:37 +0100 |
|---|---|---|
| committer | H.Merijn Brand <h.m.brand@xs4all.nl> | 2004-06-01 14:30:48 +0000 |
| commit | 27a8011f06c478a310bc7e1bbe434c4e3644afde (patch) | |
| tree | 3b7694aaa1be9a048b858b1f625e20dbdf2801e5 /win32 | |
| parent | dfc878f226e9b733eaca934d1cde9601e12ff9bb (diff) | |
| download | perl-27a8011f06c478a310bc7e1bbe434c4e3644afde.tar.gz | |
Re: Smoke [5.9.2] 22881 FAIL(M) MSWin32 WinXP/.Net SP1 (x86/1 cpu)
Message-ID: <40BC930D.90701@uk.radan.com>
p4raw-id: //depot/perl@22887
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile | 16 | ||||
| -rw-r--r-- | win32/makefile.mk | 17 |
2 files changed, 23 insertions, 10 deletions
diff --git a/win32/Makefile b/win32/Makefile index 6f3e6ce425..3039a0dd06 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -458,7 +458,8 @@ UNIDATAFILES = ..\lib\unicore\Canonical.pl ..\lib\unicore\Exact.pl \ ..\lib\unicore\PVA.pl # Directories of Unicode data files generated by mktables -UNIDATADIRS = ..\lib\unicore\To ..\lib\unicore\lib +UNIDATADIR1 = ..\lib\unicore\To +UNIDATADIR2 = ..\lib\unicore\lib PERLEXE_ICO = .\perlexe.ico PERLEXE_RES = .\perlexe.res @@ -1156,9 +1157,8 @@ inst_lib : $(CONFIGPM) $(RCOPY) ..\lib $(INST_LIB)\*.* $(UNIDATAFILES) : $(MINIPERL) $(CONFIGPM) ..\lib\unicore\mktables - cd ..\lib\unicore - ..\..\$(MINIPERL) -I..\..\lib mktables - cd ..\..\win32 + cd ..\lib\unicore && \ + ..\$(MINIPERL) -I.. mktables minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) utils $(UNIDATAFILES) $(XCOPY) $(MINIPERL) ..\t\$(NULL) @@ -1193,6 +1193,8 @@ _test : $(PERLEXE) -I..\lib harness cd ..\win32 +# the doubled rmdir calls are needed because older cmd shells +# don't understand /q _clean : -@$(DEL) miniperlmain$(o) -@$(DEL) $(MINIPERL) @@ -1207,8 +1209,12 @@ _clean : -@$(DEL) $(CORE_OBJ) -if exist $(MINIDIR) rmdir /s /q $(MINIDIR) -if exist $(MINIDIR) rmdir /s $(MINIDIR) - -if exist $(UNIDATADIRS) rmdir /s $(UNIDATADIRS) + -if exist $(UNIDATADIR1) rmdir /s /q $(UNIDATADIR1) + -if exist $(UNIDATADIR1) rmdir /s $(UNIDATADIR1) + -if exist $(UNIDATADIR2) rmdir /s /q $(UNIDATADIR2) + -if exist $(UNIDATADIR2) rmdir /s $(UNIDATADIR2) -@$(DEL) $(UNIDATAFILES) + -@$(DEL) $(WIN32_OBJ) -@$(DEL) $(DLL_OBJ) -@$(DEL) $(X2P_OBJ) -@$(DEL) ..\*$(o) ..\*.lib ..\*.exp *$(o) *.lib *.exp *.res diff --git a/win32/makefile.mk b/win32/makefile.mk index f61b7b5ea2..bd3212bfc3 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -581,7 +581,8 @@ UNIDATAFILES = ..\lib\unicore\Canonical.pl ..\lib\unicore\Exact.pl \ ..\lib\unicore\PVA.pl # Directories of Unicode data files generated by mktables -UNIDATADIRS = ..\lib\unicore\To ..\lib\unicore\lib +UNIDATADIR1 = ..\lib\unicore\To +UNIDATADIR2 = ..\lib\unicore\lib PERLEXE_ICO = .\perlexe.ico PERLEXE_RES = .\perlexe.res @@ -1192,6 +1193,8 @@ utils: $(PERLEXE) $(X2P) # Note that the pod cleanup in this next section is parsed (and regenerated # by pod/buildtoc so please check that script before making changes here +# the doubled rmdir calls are needed because older cmd shells +# don't understand /q distclean: realclean -del /f $(MINIPERL) $(PERLEXE) $(PERLDLL) $(GLOBEXE) \ $(PERLIMPLIB) ..\miniperl$(a) $(MINIMOD) @@ -1288,9 +1291,8 @@ inst_lib : $(CONFIGPM) $(RCOPY) ..\lib $(INST_LIB)\*.* $(UNIDATAFILES) : $(MINIPERL) $(CONFIGPM) ..\lib\unicore\mktables - cd ..\lib\unicore - ..\..\$(MINIPERL) -I..\..\lib mktables - cd ..\..\win32 + cd ..\lib\unicore && \ + ..\$(MINIPERL) -I.. mktables minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) $(UNIDATAFILES) utils $(XCOPY) $(MINIPERL) ..\t\$(NULL) @@ -1331,6 +1333,8 @@ _test : $(RIGHTMAKE) .ENDIF cd ..\t && $(PERLEXE) -I..\lib harness +# the doubled rmdir calls are needed because older cmd shells +# don't understand /q _clean : -@erase miniperlmain$(o) -@erase $(MINIPERL) @@ -1345,7 +1349,10 @@ _clean : -@erase $(CORE_OBJ) -if exist $(MINIDIR) rmdir /s /q $(MINIDIR) -if exist $(MINIDIR) rmdir /s $(MINIDIR) - -if exist $(UNIDATADIRS) rmdir /s $(UNIDATADIRS) + -if exist $(UNIDATADIR1) rmdir /s /q $(UNIDATADIR1) + -if exist $(UNIDATADIR1) rmdir /s $(UNIDATADIR1) + -if exist $(UNIDATADIR2) rmdir /s /q $(UNIDATADIR2) + -if exist $(UNIDATADIR2) rmdir /s $(UNIDATADIR2) -@erase $(UNIDATAFILES) -@erase $(WIN32_OBJ) -@erase $(DLL_OBJ) |