Re: [PATCH win32/makefile.mk] (was Re: 5.8.3 RC1)

Message-Id: <200401111813.40829.abe@ztreet.demon.nl>

plus revert 22092 and 22080

p4raw-id: //depot/maint-5.8/perl@22111

3 files changed, 91 insertions, 84 deletions

diff --git a/pod/buildtoc b/pod/buildtoc
index 1fccd17023..86d5ba7ebf 100644
--- a/pod/buildtoc
+++ b/pod/buildtoc
@@ -556,9 +556,9 @@ SNIP
 
 sub generate_nmake_1 {
   # XXX Fix this with File::Spec
-  (map {sprintf "\tcopy ..\\README.%-8s .\\perl$_.pod\n", $_}
+  (map {sprintf "\tcopy ..\\README.%-8s ..\\pod\\perl$_.pod\n", $_}
     sort keys %Readmes),
-      (map {"\tcopy $Copies{$_} $_\n"} sort keys %Copies);
+      (map {"\tcopy ..\\pod\\$Copies{$_} ..\\pod\\$_\n"} sort keys %Copies);
 }
 
 # This doesn't have a trailing newline
@@ -608,7 +608,7 @@ sub do_nmake {
   1 while $makefile =~ s/\0\tcopy .*\n/\0/gm;
   $makefile =~ s/\0+/join ("", &generate_nmake_1)/se;
 
-  $makefile =~ s{(cd \$\(PODDIR\)\n\t-del /f [^\n]+).*?(pod2html)}
+  $makefile =~ s{(del /f [^\n]+checkpods[^\n]+).*?(pod2html)}
     {"$1\n" . &generate_nmake_2."\n\t    $2"}se;
   $makefile;
 }
diff --git a/win32/Makefile b/win32/Makefile
index efad99e50a..6600fa92e6 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -992,54 +992,60 @@ doc: $(PERLEXE)
 	    --podpath=pod:lib:ext:utils --htmlroot="file://$(INST_HTML::=|)" \
 	    --libpod=perlfunc:perlguts:perlvar:perlrun:perlop --recurse
 
+# Note that this next section is parsed (and regenerated) by pod/buildtoc
+# so please check that script before making structural changes here
+
 utils: $(PERLEXE) $(X2P)
 	cd ..\utils
 	$(MAKE) PERL=$(MINIPERL)
 	cd ..\pod
 	copy ..\vms\perlvms.pod .\perlvms.pod
-	copy ..\README.aix      .\perlaix.pod
-	copy ..\README.amiga    .\perlamiga.pod
-	copy ..\README.apollo   .\perlapollo.pod
-	copy ..\README.beos     .\perlbeos.pod
-	copy ..\README.bs2000   .\perlbs2000.pod
-	copy ..\README.ce       .\perlce.pod
-	copy ..\README.cn       .\perlcn.pod
-	copy ..\README.cygwin   .\perlcygwin.pod
-	copy ..\README.dgux     .\perldgux.pod
-	copy ..\README.dos      .\perldos.pod
-	copy ..\README.epoc     .\perlepoc.pod
-	copy ..\README.freebsd  .\perlfreebsd.pod
-	copy ..\README.hpux     .\perlhpux.pod
-	copy ..\README.hurd     .\perlhurd.pod
-	copy ..\README.irix     .\perlirix.pod
-	copy ..\README.jp       .\perljp.pod
-	copy ..\README.ko       .\perlko.pod
-	copy ..\README.machten  .\perlmachten.pod
-	copy ..\README.macos    .\perlmacos.pod
-	copy ..\README.macosx   .\perlmacosx.pod
-	copy ..\README.mint     .\perlmint.pod
-	copy ..\README.mpeix    .\perlmpeix.pod
-	copy ..\README.netware  .\perlnetware.pod
-	copy ..\README.os2      .\perlos2.pod
-	copy ..\README.os390    .\perlos390.pod
-	copy ..\README.os400    .\perlos400.pod
-	copy ..\README.plan9    .\perlplan9.pod
-	copy ..\README.qnx      .\perlqnx.pod
-	copy ..\README.solaris  .\perlsolaris.pod
-	copy ..\README.tru64    .\perltru64.pod
-	copy ..\README.tw       .\perltw.pod
-	copy ..\README.uts      .\perluts.pod
-	copy ..\README.vmesa    .\perlvmesa.pod
-	copy ..\README.vms      .\perlvms.pod
-	copy ..\README.vos      .\perlvos.pod
-	copy ..\README.win32    .\perlwin32.pod
-	copy perl583delta.pod perldelta.pod
+	copy ..\README.aix      ..\pod\perlaix.pod
+	copy ..\README.amiga    ..\pod\perlamiga.pod
+	copy ..\README.apollo   ..\pod\perlapollo.pod
+	copy ..\README.beos     ..\pod\perlbeos.pod
+	copy ..\README.bs2000   ..\pod\perlbs2000.pod
+	copy ..\README.ce       ..\pod\perlce.pod
+	copy ..\README.cn       ..\pod\perlcn.pod
+	copy ..\README.cygwin   ..\pod\perlcygwin.pod
+	copy ..\README.dgux     ..\pod\perldgux.pod
+	copy ..\README.dos      ..\pod\perldos.pod
+	copy ..\README.epoc     ..\pod\perlepoc.pod
+	copy ..\README.freebsd  ..\pod\perlfreebsd.pod
+	copy ..\README.hpux     ..\pod\perlhpux.pod
+	copy ..\README.hurd     ..\pod\perlhurd.pod
+	copy ..\README.irix     ..\pod\perlirix.pod
+	copy ..\README.jp       ..\pod\perljp.pod
+	copy ..\README.ko       ..\pod\perlko.pod
+	copy ..\README.machten  ..\pod\perlmachten.pod
+	copy ..\README.macos    ..\pod\perlmacos.pod
+	copy ..\README.macosx   ..\pod\perlmacosx.pod
+	copy ..\README.mint     ..\pod\perlmint.pod
+	copy ..\README.mpeix    ..\pod\perlmpeix.pod
+	copy ..\README.netware  ..\pod\perlnetware.pod
+	copy ..\README.os2      ..\pod\perlos2.pod
+	copy ..\README.os390    ..\pod\perlos390.pod
+	copy ..\README.os400    ..\pod\perlos400.pod
+	copy ..\README.plan9    ..\pod\perlplan9.pod
+	copy ..\README.qnx      ..\pod\perlqnx.pod
+	copy ..\README.solaris  ..\pod\perlsolaris.pod
+	copy ..\README.tru64    ..\pod\perltru64.pod
+	copy ..\README.tw       ..\pod\perltw.pod
+	copy ..\README.uts      ..\pod\perluts.pod
+	copy ..\README.vmesa    ..\pod\perlvmesa.pod
+	copy ..\README.vms      ..\pod\perlvms.pod
+	copy ..\README.vos      ..\pod\perlvos.pod
+	copy ..\README.win32    ..\pod\perlwin32.pod
+	copy ..\pod\perl583delta.pod ..\pod\perldelta.pod
 	$(MAKE) -f ..\win32\pod.mak converters
 	cd ..\lib
 	$(PERLEXE) lib_pm.PL
 	cd ..\win32
 	$(PERLEXE) $(PL2BAT) $(UTILS)
 
+# 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: clean
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 87bcb91adf..478d2073f3 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1125,52 +1125,54 @@ doc: $(PERLEXE)
 	    --podpath=pod:lib:ext:utils --htmlroot="file://$(INST_HTML:s,:,|,)"\
 	    --libpod=perlfunc:perlguts:perlvar:perlrun:perlop --recurse
 
+# Note that this next section is parsed (and regenerated) by pod/buildtoc
+# so please check that script before making structural changes here
 utils: $(PERLEXE) $(X2P)
-[
 	cd ..\utils && $(MAKE) PERL=$(MINIPERL)
-	cd ..\pod
 	copy ..\vms\perlvms.pod	..\pod\perlvms.pod
-	copy ..\README.aix      .\perlaix.pod
-	copy ..\README.amiga    .\perlamiga.pod
-	copy ..\README.apollo   .\perlapollo.pod
-	copy ..\README.beos     .\perlbeos.pod
-	copy ..\README.bs2000   .\perlbs2000.pod
-	copy ..\README.ce       .\perlce.pod
-	copy ..\README.cn       .\perlcn.pod
-	copy ..\README.cygwin   .\perlcygwin.pod
-	copy ..\README.dgux     .\perldgux.pod
-	copy ..\README.dos      .\perldos.pod
-	copy ..\README.epoc     .\perlepoc.pod
-	copy ..\README.freebsd  .\perlfreebsd.pod
-	copy ..\README.hpux     .\perlhpux.pod
-	copy ..\README.hurd     .\perlhurd.pod
-	copy ..\README.irix     .\perlirix.pod
-	copy ..\README.jp       .\perljp.pod
-	copy ..\README.ko       .\perlko.pod
-	copy ..\README.machten  .\perlmachten.pod
-	copy ..\README.macos    .\perlmacos.pod
-	copy ..\README.macosx   .\perlmacosx.pod
-	copy ..\README.mint     .\perlmint.pod
-	copy ..\README.mpeix    .\perlmpeix.pod
-	copy ..\README.netware  .\perlnetware.pod
-	copy ..\README.os2      .\perlos2.pod
-	copy ..\README.os390    .\perlos390.pod
-	copy ..\README.os400    .\perlos400.pod
-	copy ..\README.plan9    .\perlplan9.pod
-	copy ..\README.qnx      .\perlqnx.pod
-	copy ..\README.solaris  .\perlsolaris.pod
-	copy ..\README.tru64    .\perltru64.pod
-	copy ..\README.tw       .\perltw.pod
-	copy ..\README.uts      .\perluts.pod
-	copy ..\README.vmesa    .\perlvmesa.pod
-	copy ..\README.vms      .\perlvms.pod
-	copy ..\README.vos      .\perlvos.pod
-	copy ..\README.win32    .\perlwin32.pod
-	copy perl583delta.pod perldelta.pod
-	$(MAKE) -f ..\win32\pod.mak converters
+	copy ..\README.aix      ..\pod\perlaix.pod
+	copy ..\README.amiga    ..\pod\perlamiga.pod
+	copy ..\README.apollo   ..\pod\perlapollo.pod
+	copy ..\README.beos     ..\pod\perlbeos.pod
+	copy ..\README.bs2000   ..\pod\perlbs2000.pod
+	copy ..\README.ce       ..\pod\perlce.pod
+	copy ..\README.cn       ..\pod\perlcn.pod
+	copy ..\README.cygwin   ..\pod\perlcygwin.pod
+	copy ..\README.dgux     ..\pod\perldgux.pod
+	copy ..\README.dos      ..\pod\perldos.pod
+	copy ..\README.epoc     ..\pod\perlepoc.pod
+	copy ..\README.freebsd  ..\pod\perlfreebsd.pod
+	copy ..\README.hpux     ..\pod\perlhpux.pod
+	copy ..\README.hurd     ..\pod\perlhurd.pod
+	copy ..\README.irix     ..\pod\perlirix.pod
+	copy ..\README.jp       ..\pod\perljp.pod
+	copy ..\README.ko       ..\pod\perlko.pod
+	copy ..\README.machten  ..\pod\perlmachten.pod
+	copy ..\README.macos    ..\pod\perlmacos.pod
+	copy ..\README.macosx   ..\pod\perlmacosx.pod
+	copy ..\README.mint     ..\pod\perlmint.pod
+	copy ..\README.mpeix    ..\pod\perlmpeix.pod
+	copy ..\README.netware  ..\pod\perlnetware.pod
+	copy ..\README.os2      ..\pod\perlos2.pod
+	copy ..\README.os390    ..\pod\perlos390.pod
+	copy ..\README.os400    ..\pod\perlos400.pod
+	copy ..\README.plan9    ..\pod\perlplan9.pod
+	copy ..\README.qnx      ..\pod\perlqnx.pod
+	copy ..\README.solaris  ..\pod\perlsolaris.pod
+	copy ..\README.tru64    ..\pod\perltru64.pod
+	copy ..\README.tw       ..\pod\perltw.pod
+	copy ..\README.uts      ..\pod\perluts.pod
+	copy ..\README.vmesa    ..\pod\perlvmesa.pod
+	copy ..\README.vms      ..\pod\perlvms.pod
+	copy ..\README.vos      ..\pod\perlvos.pod
+	copy ..\README.win32    ..\pod\perlwin32.pod
+	copy ..\pod\perl583delta.pod ..\pod\perldelta.pod
+	cd ..\pod && $(MAKE) -f ..\win32\pod.mak converters
 	cd ..\lib && $(PERLEXE) lib_pm.PL
-	cd ..\win32 &&$(PERLEXE) $(PL2BAT) $(UTILS)
-]
+	$(PERLEXE) $(PL2BAT) $(UTILS)
+
+# 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
 
 distclean: clean
 	-del /f $(MINIPERL) $(PERLEXE) $(PERLDLL) $(GLOBEXE) \
@@ -1214,8 +1216,7 @@ distclean: clean
 	-if exist $(LIBDIR)\Scalar rmdir /s $(LIBDIR)\Scalar
 	-if exist $(LIBDIR)\XS rmdir /s /q $(LIBDIR)\XS
 	-if exist $(LIBDIR)\XS rmdir /s $(LIBDIR)\XS
-	-cd $(PODDIR)
-	-del /f *.html *.bat checkpods \
+	-cd $(PODDIR) && del /f *.html *.bat checkpods \
 	    perlaix.pod perlamiga.pod perlapollo.pod perlbeos.pod \
 	    perlbs2000.pod perlce.pod perlcn.pod perlcygwin.pod \
 	    perldelta.pod perldgux.pod perldos.pod perlepoc.pod \