Integrate change #9639 from maintperl into mainline:

on windows, many of the README.* pods were being copied to
the wrong location

p4raw-link: @9639 on //depot/maint-5.6/perl: 91bbe2a83b3b20b503515c0217ff33da895ae050

p4raw-id: //depot/perl@9644
p4raw-integrated: from //depot/maint-5.6/perl@9643 'merge in'
	win32/Makefile win32/makefile.mk (@9587..)

diff --git a/win32/Makefile b/win32/Makefile
index bd880e0..698ad9d 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -1036,23 +1036,23 @@ utils: $(PERLEXE) $(X2P)
        cd ..\utils
        $(MAKE) PERL=$(MINIPERL)
        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.solaris .\perlsolaris.pod
-       copy ..\README.vmesa .\perlvmesa.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.solaris  .\perlsolaris.pod
+       copy ..\README.vmesa    .\perlvmesa.pod
        copy ..\vms\perlvms.pod .\perlvms.pod
-       copy ..\README.vos .\perlvos.pod
-       copy ..\README.win32 .\perlwin32.pod
+       copy ..\README.vos      .\perlvos.pod
+       copy ..\README.win32    .\perlwin32.pod
        $(MAKE) -f ..\win32\pod.mak converters
        cd ..\lib
        $(PERLEXE) lib_pm.PL
@@ -1100,11 +1100,11 @@ distclean: clean
        -if exist $(LIBDIR)\MIME rmdir /s /q $(LIBDIR)\MIME
        -rmdir /s $(LIBDIR)\MIME
        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 \
+       -del /f *.html *.bat checkpods \
+           perlaix.pod perlamiga.pod perlbs2000.pod perlcygwin.pod \
+           perldos.pod perlepoc.pod perlhpux.pod perlmachten.pod \
+           perlmacos.pod perlmpeix.pod perlos2.pod perlos390.pod \
+           perlsolaris.pod perlvmesa.pod perlvms.pod perlvos.pod \
            perlwin32.pod pod2html pod2latex pod2man pod2text pod2usage \
            podchecker podselect
        cd ..\utils

diff --git a/win32/makefile.mk b/win32/makefile.mk
index f2656e4..727202f 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1081,23 +1081,23 @@ doc: $(PERLEXE)
 
 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 ..\pod\perlsolaris.pod
-       copy ..\README.vmesa ..\pod\perlvmesa.pod
-       copy ..\vms\perlvms.pod ..\pod\perlvms.pod
-       copy ..\README.vos ..\pod\perlvos.pod
-       copy ..\README.win32 ..\pod\perlwin32.pod
+       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  ..\pod\perlsolaris.pod
+       copy ..\README.vmesa    ..\pod\perlvmesa.pod
+       copy ..\vms\perlvms.pod ..\pod\perlvms.pod
+       copy ..\README.vos      ..\pod\perlvos.pod
+       copy ..\README.win32    ..\pod\perlwin32.pod
        cd ..\pod && $(MAKE) -f ..\win32\pod.mak converters
        cd ..\lib && $(PERLEXE) lib_pm.PL
        $(PERLEXE) $(PL2BAT) $(UTILS)
@@ -1132,11 +1132,13 @@ 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
-       -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 $(PODDIR) && del /f *.html *.bat checkpods \
+           perlaix.pod perlamiga.pod perlbs2000.pod perlcygwin.pod \
+           perldos.pod perlepoc.pod perlhpux.pod perlmachten.pod \
+           perlmacos.pod perlmpeix.pod perlos2.pod perlos390.pod \
+           perlsolaris.pod perlvmesa.pod perlvms.pod perlvos.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