Change 27532 by [EMAIL PROTECTED] on 2006/03/17 13:20:11
Make "distclean" target on Win32 clean up temporary HTML directory
that gets left behind after running the "install" target.
Also clean up a couple of leftover pod2html cache files.
Affected files ...
... //depot/perl/win32/Makefile#296 edit
... //depot/perl/win32/makefile.mk#335 edit
Differences ...
==== //depot/perl/win32/Makefile#296 (text) ====
Index: perl/win32/Makefile
--- perl/win32/Makefile#295~27530~ 2006-03-17 03:10:41.000000000 -0800
+++ perl/win32/Makefile 2006-03-17 05:20:11.000000000 -0800
@@ -353,6 +353,7 @@
EXTDIR = ..\ext
PODDIR = ..\pod
EXTUTILSDIR = $(LIBDIR)\ExtUtils
+HTMLDIR = .\html
#
INST_SCRIPT = $(INST_TOP)$(INST_VER)\bin
@@ -1083,7 +1084,7 @@
#-------------------------------------------------------------------------------
doc: $(PERLEXE)
- $(PERLEXE) -I..\lib ..\installhtml --podroot=.. --htmldir=./html \
+ $(PERLEXE) -I..\lib ..\installhtml --podroot=.. --htmldir=$(HTMLDIR) \
--podpath=pod:lib:ext:utils --htmlroot="file://$(INST_HTML::=|)" \
--libpod=perlfunc:perlguts:perlvar:perlrun:perlop --recurse
@@ -1219,6 +1220,9 @@
-cd $(EXTDIR) && del /s *.def Makefile Makefile.old
-if exist $(AUTODIR) rmdir /s /q $(AUTODIR)
-if exist $(COREDIR) rmdir /s /q $(COREDIR)
+ -if exist pod2htmd.tmp del pod2htmd.tmp
+ -if exist pod2htmi.tmp del pod2htmi.tmp
+ -if exist $(HTMLDIR) rmdir /s /q $(HTMLDIR)
install : all installbare installhtml
@@ -1231,7 +1235,7 @@
$(XCOPY) bin\*.bat $(INST_SCRIPT)\*.*
installhtml : doc
- $(RCOPY) html\*.* $(INST_HTML)\*.*
+ $(RCOPY) $(HTMLDIR)\*.* $(INST_HTML)\*.*
inst_lib : $(CONFIGPM)
copy splittree.pl ..
==== //depot/perl/win32/makefile.mk#335 (text) ====
Index: perl/win32/makefile.mk
--- perl/win32/makefile.mk#334~27530~ 2006-03-17 03:10:41.000000000 -0800
+++ perl/win32/makefile.mk 2006-03-17 05:20:11.000000000 -0800
@@ -348,6 +348,7 @@
EXTDIR = ..\ext
PODDIR = ..\pod
EXTUTILSDIR = $(LIBDIR)\ExtUtils
+HTMLDIR = .\html
#
INST_SCRIPT = $(INST_TOP)$(INST_VER)\bin
@@ -1236,7 +1237,7 @@
doc: $(PERLEXE)
- $(PERLEXE) -I..\lib ..\installhtml --podroot=.. --htmldir=./html \
+ $(PERLEXE) -I..\lib ..\installhtml --podroot=.. --htmldir=$(HTMLDIR) \
--podpath=pod:lib:ext:utils --htmlroot="file://$(INST_HTML:s,:,|,)"\
--libpod=perlfunc:perlguts:perlvar:perlrun:perlop --recurse
@@ -1366,6 +1367,9 @@
-cd $(EXTDIR) && del /s *.def Makefile Makefile.old
-if exist $(AUTODIR) rmdir /s /q $(AUTODIR)
-if exist $(COREDIR) rmdir /s /q $(COREDIR)
+ -if exist pod2htmd.tmp del pod2htmd.tmp
+ -if exist pod2htmi.tmp del pod2htmi.tmp
+ -if exist $(HTMLDIR) rmdir /s /q $(HTMLDIR)
install : all installbare installhtml
@@ -1378,7 +1382,7 @@
$(XCOPY) bin\*.bat $(INST_SCRIPT)\*.*
installhtml : doc
- $(RCOPY) html\*.* $(INST_HTML)\*.*
+ $(RCOPY) $(HTMLDIR)\*.* $(INST_HTML)\*.*
inst_lib : $(CONFIGPM)
copy splittree.pl ..
End of Patch.
