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.

p4raw-id: //depot/perl@27532

diff --git a/win32/Makefile b/win32/Makefile
index 493b3ec73d74badb0f1060270a116117811a3897..77f9ddc2c6a8290277d8160aeff5c81ddd719c30 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -353,6 +353,7 @@ LIBDIR              = ..\lib
 EXTDIR         = ..\ext
 PODDIR         = ..\pod
 EXTUTILSDIR    = $(LIBDIR)\ExtUtils
+HTMLDIR                = .\html
 
 #
 INST_SCRIPT    = $(INST_TOP)$(INST_VER)\bin
@@ -1083,7 +1084,7 @@ Extensions_realclean:
 #-------------------------------------------------------------------------------
 
 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 @@ distclean: realclean
        -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 @@ installbare : utils
        $(XCOPY) bin\*.bat $(INST_SCRIPT)\*.*
 
 installhtml : doc
-       $(RCOPY) html\*.* $(INST_HTML)\*.*
+       $(RCOPY) $(HTMLDIR)\*.* $(INST_HTML)\*.*
 
 inst_lib : $(CONFIGPM)
        copy splittree.pl ..

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 2fe0c4461d3ddf48dc6a30375c5abd7c5bc5f17c..ebf6e444f00561211db46e6bb6a783e2d2fc287e 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -348,6 +348,7 @@ LIBDIR              = ..\lib
 EXTDIR         = ..\ext
 PODDIR         = ..\pod
 EXTUTILSDIR    = $(LIBDIR)\ExtUtils
+HTMLDIR                = .\html
 
 #
 INST_SCRIPT    = $(INST_TOP)$(INST_VER)\bin
@@ -1236,7 +1237,7 @@ Extensions_realclean :
 
 
 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 @@ distclean: realclean
        -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 @@ installbare : $(RIGHTMAKE) utils
        $(XCOPY) bin\*.bat $(INST_SCRIPT)\*.*
 
 installhtml : doc
-       $(RCOPY) html\*.* $(INST_HTML)\*.*
+       $(RCOPY) $(HTMLDIR)\*.* $(INST_HTML)\*.*
 
 inst_lib : $(CONFIGPM)
        copy splittree.pl ..