Change 34662 by [EMAIL PROTECTED] on 2008/10/30 13:03:53
Integrate:
[ 34640]
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.
[direct to 5.8.x because the parts that aren't yet relevant to 5.10.x
will become so once the move of Test::Harness to ext/ is merged]
Affected files ...
... //depot/maint-5.8/perl/Makefile.SH#77 integrate
... //depot/maint-5.8/perl/win32/Makefile#75 integrate
... //depot/maint-5.8/perl/win32/makefile.mk#83 integrate
Differences ...
==== //depot/maint-5.8/perl/Makefile.SH#77 (text) ====
Index: perl/Makefile.SH
--- perl/Makefile.SH#76~34289~ 2008-09-05 16:04:00.000000000 -0700
+++ perl/Makefile.SH 2008-10-30 06:03:53.000000000 -0700
@@ -1156,6 +1156,7 @@
rm -f preload lib/re.pm
rm -f testcompile compilelog
rm -rf lib/Encode lib/Hash lib/re
+ rm -rf lib/Module/Pluggable
rm -f lib/ExtUtils/ParseXS/t/XSTest.c
rm -f lib/ExtUtils/ParseXS/t/XSTest$(OBJ_EXT)
rm -f lib/ExtUtils/ParseXS/t/XSTest$(DLSUFFIX)
==== //depot/maint-5.8/perl/win32/Makefile#75 (text) ====
Index: perl/win32/Makefile
--- perl/win32/Makefile#74~33635~ 2008-04-03 03:53:54.000000000 -0700
+++ perl/win32/Makefile 2008-10-30 06:03:53.000000000 -0700
@@ -1180,6 +1180,7 @@
-if exist $(LIBDIR)\List rmdir /s /q $(LIBDIR)\List
-if exist $(LIBDIR)\List rmdir /s $(LIBDIR)\List
-if exist $(LIBDIR)\Hash rmdir /s /q $(LIBDIR)\Hash
+ -if exist $(LIBDIR)\Module\Pluggable rmdir /s /q
$(LIBDIR)\Module\Pluggable
-if exist $(LIBDIR)\IO rmdir /s /q $(LIBDIR)\IO
-if exist $(LIBDIR)\List rmdir /s /q $(LIBDIR)\List
-if exist $(LIBDIR)\MIME rmdir /s /q $(LIBDIR)\MIME
==== //depot/maint-5.8/perl/win32/makefile.mk#83 (text) ====
Index: perl/win32/makefile.mk
--- perl/win32/makefile.mk#82~33635~ 2008-04-03 03:53:54.000000000 -0700
+++ perl/win32/makefile.mk 2008-10-30 06:03:53.000000000 -0700
@@ -1491,6 +1491,7 @@
-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)\Module\Pluggable rmdir /s /q
$(LIBDIR)\Module\Pluggable
-if exist $(LIBDIR)\IO rmdir /s /q $(LIBDIR)\IO
-if exist $(LIBDIR)\IO\Uncompress rmdir /s /q $(LIBDIR)\IO\Uncompress
-if exist $(LIBDIR)\List rmdir /s /q $(LIBDIR)\List
End of Patch.
