summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorNick Ing-Simmons <nik@tiuk.ti.com>2001-04-06 20:34:59 +0000
committerNick Ing-Simmons <nik@tiuk.ti.com>2001-04-06 20:34:59 +0000
commit231c9faeb17b45588bbde0b49d0d32f25d2a1286 (patch)
tree608a5dbc92006863e3efe7292c4523bff005bd3c /win32
parent0a1f2d144e4463451f8627bd1c6ca420a59b01b0 (diff)
parent8b3f264028a458ce6664fc907094c8ad5e735d34 (diff)
downloadperl-231c9faeb17b45588bbde0b49d0d32f25d2a1286.tar.gz
Integrate mainline
p4raw-id: //depot/perlio@9598
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile16
-rw-r--r--win32/makefile.mk13
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