make distclean patch from Andy Armstrong.

(Distclean isn't perfect yet because there's a spurious directory tree
created but not cleaned up by ext/Test/Harness/t/harness.t, but Andy is
working on fixing the cause)
No idea about the state of play of disclean on VMS - I couldn't see how
or where to add the three extra directories to it.

p4raw-id: //depot/perl@34640

diff --git a/Makefile.SH b/Makefile.SH
index 386950c..7650185 100644 (file)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -1211,6 +1211,7 @@ _cleaner2:
        rm -rf .config
        rm -f preload lib/re.pm
        rm -rf lib/Encode lib/Compress lib/Hash lib/re
+       rm -rf lib/TAP lib/Module/Pluggable lib/App
        rm -rf lib/IO/Compress lib/IO/Uncompress
        rm -f lib/ExtUtils/ParseXS/t/XSTest.c
        rm -f lib/ExtUtils/ParseXS/t/XSTest$(OBJ_EXT)

diff --git a/win32/Makefile b/win32/Makefile
index adf57dc..93dc31c 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -1183,6 +1183,9 @@ distclean: realclean
        -if exist $(LIBDIR)\Encode rmdir /s /q $(LIBDIR)\Encode
        -if exist $(LIBDIR)\Filter\Util rmdir /s /q $(LIBDIR)\Filter\Util
        -if exist $(LIBDIR)\Hash rmdir /s /q $(LIBDIR)\Hash
+       -if exist $(LIBDIR)\App rmdir /s /q $(LIBDIR)\App
+       -if exist $(LIBDIR)\Module\Pluggable rmdir /s /q $(LIBDIR)\Module\Pluggable
+       -if exist $(LIBDIR)\TAP rmdir /s /q $(LIBDIR)\TAP
        -if exist $(LIBDIR)\IO\Compress rmdir /s /q $(LIBDIR)\IO\Compress
        -if exist $(LIBDIR)\IO\Socket rmdir /s /q $(LIBDIR)\IO\Socket
        -if exist $(LIBDIR)\IO\Uncompress rmdir /s /q $(LIBDIR)\IO\Uncompress

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 6ff01a6..e67458f 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1507,6 +1507,9 @@ distclean: realclean
        -if exist $(LIBDIR)\Encode rmdir /s /q $(LIBDIR)\Encode
        -if exist $(LIBDIR)\Filter\Util rmdir /s /q $(LIBDIR)\Filter\Util
        -if exist $(LIBDIR)\Hash rmdir /s /q $(LIBDIR)\Hash
+       -if exist $(LIBDIR)\App rmdir /s /q $(LIBDIR)\App
+       -if exist $(LIBDIR)\Module\Pluggable rmdir /s /q $(LIBDIR)\Module\Pluggable
+       -if exist $(LIBDIR)\TAP rmdir /s /q $(LIBDIR)\TAP
        -if exist $(LIBDIR)\IO\Compress rmdir /s /q $(LIBDIR)\IO\Compress
        -if exist $(LIBDIR)\IO\Socket rmdir /s /q $(LIBDIR)\IO\Socket
        -if exist $(LIBDIR)\IO\Uncompress rmdir /s /q $(LIBDIR)\IO\Uncompress