diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2001-04-06 13:31:45 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2001-04-06 13:31:45 +0000 |
| commit | 26d9b02fa65570745e70dcbd0d92c1354fc4ecff (patch) | |
| tree | ae2db66c225f4f6f1bc57a6588774da590a98fcf /win32 | |
| parent | d835aa991e488d789654708a6729f9b9f5a81fb2 (diff) | |
| download | perl-26d9b02fa65570745e70dcbd0d92c1354fc4ecff.tar.gz | |
Integrate changes #9584,9587 from maintperl into mainline.
keep eval"" CVs alive until the end of the statement in which
they're called
add README.macos (from Chris Nandor)
tyop in change#9555
p4raw-link: @9587 on //depot/maint-5.6/perl: d72c2fc956b5cb46ede17d06f89a463c78f1cf5f
p4raw-link: @9584 on //depot/maint-5.6/perl: e6fbcc36a54a8afd8dbcdcb9a8d8e178df530b97
p4raw-link: @9555 on //depot/perl: 6a0af2f17bcde4767b90a72eff7083c5effff21d
p4raw-id: //depot/perl@9588
p4raw-branched: from //depot/maint-5.6/perl@9583 'branch in'
README.macos
p4raw-integrated: from //depot/maint-5.6/perl@9583 'copy in'
pod/perlfaq9.pod (@9585..) 'merge in' scope.h (@8568..)
pod/perl.pod (@8986..) MANIFEST (@9227..) win32/Makefile
(@9286..) pp_ctl.c scope.c (@9288..) global.sym (@9289..)
embed.h embed.pl objXSUB.h perlapi.c proto.h (@9292..)
pod/buildtoc.PL (@9312..) win32/makefile.mk (@9495..) sv.c
(@9496..) pod/perlguts.pod (@9514..)
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile | 16 | ||||
| -rw-r--r-- | win32/makefile.mk | 13 |
2 files changed, 21 insertions, 8 deletions
diff --git a/win32/Makefile b/win32/Makefile index 429569e788..f7eda74ed6 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -1038,16 +1038,18 @@ utils: $(PERLEXE) $(X2P) cd ..\pod copy ..\README.aix .\perlaix.pod copy ..\README.amiga .\perlamiga.pod + copy ..\README.bs2000 .\perlbs2000.pod copy ..\README.cygwin .\perlcygwin.pod copy ..\README.dos .\perldos.pod copy ..\README.epoc .\perlepoc.pod copy ..\README.hpux .\perlhpux.pod copy ..\README.machten .\perlmachten.pod + copy ..\README.macos .\perlmacos.pod + copy ..\README.mpeix .\perlmpeix.pod copy ..\README.os2 .\perlos2.pod copy ..\README.os390 .\perlos390.pod - copy ..\README.vmesa .\perlvmesa.pod - copy ..\README.bs2000 .\perlbs2000.pod copy ..\README.solaris .\perlsolaris.pod + copy ..\README.vmesa .\perlvmesa.pod copy ..\vms\perlvms.pod .\perlvms.pod copy ..\README.vos .\perlvos.pod copy ..\README.win32 .\perlwin32.pod @@ -1097,8 +1099,14 @@ distclean: clean -rmdir /s $(LIBDIR)\MIME\Base64 -if exist $(LIBDIR)\MIME rmdir /s /q $(LIBDIR)\MIME -rmdir /s $(LIBDIR)\MIME - -del /f $(PODDIR)\*.html - -del /f $(PODDIR)\*.bat + cd $(PODDIR) + -del /f *.html + -del /f *.bat + -del /f checkpods perlamiga.pod perlcygwin.pod \ + perldos.pod perlhpux.pod perlmachten.pod perlmacos.pod \ + perlmpeix.pod perlos2.pod perlvms.pod \ + perlwin32.pod pod2html pod2latex pod2man pod2text pod2usage \ + podchecker podselect cd ..\utils -del /f h2ph splain perlbug pl2pm c2ph h2xs perldoc dprofpp -del /f *.bat diff --git a/win32/makefile.mk b/win32/makefile.mk index 499453bcaf..5333ce650c 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1085,16 +1085,18 @@ utils: $(PERLEXE) $(X2P) cd ..\utils && $(MAKE) PERL=$(MINIPERL) copy ..\README.aix ..\pod\perlaix.pod copy ..\README.amiga ..\pod\perlamiga.pod + copy ..\README.bs2000 ..\pod\perlbs2000.pod copy ..\README.cygwin ..\pod\perlcygwin.pod copy ..\README.dos ..\pod\perldos.pod copy ..\README.epoc ..\pod\perlepoc.pod copy ..\README.hpux ..\pod\perlhpux.pod copy ..\README.machten ..\pod\perlmachten.pod + copy ..\README.macos ..\pod\perlmacos.pod + copy ..\README.mpeix ..\pod\perlmpeix.pod copy ..\README.os2 ..\pod\perlos2.pod copy ..\README.os390 ..\pod\perlos390.pod + copy ..\README.solaris .\perlsolaris.pod copy ..\README.vmesa ..\pod\perlvmesa.pod - copy ..\README.bs2000 ..\pod\perlbs2000.pod - copy ..\README.solaris ..\pod\perlsolaris.pod copy ..\vms\perlvms.pod ..\pod\perlvms.pod copy ..\README.vos ..\pod\perlvos.pod copy ..\README.win32 ..\pod\perlwin32.pod @@ -1132,8 +1134,11 @@ distclean: clean -if exist $(LIBDIR)\Digest rmdir /s /q $(LIBDIR)\Digest || rmdir /s $(LIBDIR)\Digest -if exist $(LIBDIR)\MIME\Base64 rmdir /s /q $(LIBDIR)\MIME\Base64 || rmdir /s $(LIBDIR)\MIME\Base64 -if exist $(LIBDIR)\MIME rmdir /s /q $(LIBDIR)\MIME || rmdir /s $(LIBDIR)\MIME - -del /f $(PODDIR)\*.html - -del /f $(PODDIR)\*.bat + -cd $(PODDIR) && del /f *.html *.bat checkpods perlamiga.pod \ + perlcygwin.pod perldos.pod perlhpux.pod perlmachten.pod \ + perlmacos.pod perlmpeix.pod \ + perlos2.pod perlvms.pod perlwin32.pod pod2html pod2latex \ + pod2man pod2text pod2usage podchecker podselect -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph h2xs perldoc \ dprofpp *.bat -cd ..\x2p && del /f find2perl s2p *.bat |