diff options
| author | Steve Hay <SteveHay@planit.com> | 2006-03-17 13:20:11 +0000 |
|---|---|---|
| committer | Steve Hay <SteveHay@planit.com> | 2006-03-17 13:20:11 +0000 |
| commit | b4a415570dc258ddaff4bbab5c0f83c1af645b29 (patch) | |
| tree | 51a320d1e3da9f04f57c3b6400d62b5b4e85f2d0 /win32 | |
| parent | ea2e65188a6601dcbaa0912ec6b5cf4806638424 (diff) | |
| download | perl-b4a415570dc258ddaff4bbab5c0f83c1af645b29.tar.gz | |
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
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile | 8 | ||||
| -rw-r--r-- | win32/makefile.mk | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/win32/Makefile b/win32/Makefile index 493b3ec73d..77f9ddc2c6 100644 --- 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 2fe0c4461d..ebf6e444f0 100644 --- 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 .. |