From 95aef5ce57c6b21aaca89963b58b4cd8d853189a Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@bestpractical.com>
Date: Sun, 4 Oct 2009 06:18:19 +0900
Subject: [PATCH] 'make distclean now results in an actually-clean tree.

---
 Makefile.SH               | 4 ++--
 dist/XSLoader/Makefile.PL | 2 +-
 x2p/Makefile.SH           | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile.SH b/Makefile.SH
index 42733de..150c60e 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -1201,7 +1201,7 @@ _mopup:
 	-rm -f cygwin.c libperl*.def libperl*.dll cygperl*.dll *.exe.stackdump
 	-rm -f perl$(EXE_EXT) $(MINIPERL_EXE) $(LIBPERL) libperl.* microperl
 	-rm -f opcode.h-old opnames.h-old pp.sym-old pp_proto.h-old
-	-rm -f config.arch config.over $(DTRACE_H)
+	-rm -f config.arch config.over $(DTRACE_H) runtests
 
 # Do not 'make _tidy' directly.
 _tidy:
@@ -1264,7 +1264,7 @@ _cleaner2:
 	-rm -f lib/ExtUtils/ParseXS/t/libXSTest.dll.a
 
 _realcleaner:
-	@$(LDLIBPTH) $(MAKE) _cleaner1 CLEAN=realclean
+	@$(LDLIBPTH) $(MAKE) _cleaner1 CLEAN=distclean
 	@$(LDLIBPTH) $(MAKE) _cleaner2
 
 _verycleaner:
diff --git a/dist/XSLoader/Makefile.PL b/dist/XSLoader/Makefile.PL
index 0383532..a06d7cc 100644
--- a/dist/XSLoader/Makefile.PL
+++ b/dist/XSLoader/Makefile.PL
@@ -40,7 +40,7 @@ WriteMakefile(
         'Test::More' => '0.62',
     },
     dist            => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
-    clean           => { FILES => 'XSLoader-*' },
+    clean           => { FILES => 'XSLoader-* XSLoader.pm' },
 );
 
 # Unlink the .pm file included with the distribution
diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH
index ba56c49..296fdc8 100755
--- a/x2p/Makefile.SH
+++ b/x2p/Makefile.SH
@@ -143,6 +143,8 @@ a2p$(OBJ_EXT): a2p.c a2py.c a2p.h EXTERN.h util.h INTERN.h \
 clean:
 	rm -f a2p$(EXE_EXT) psed *$(OBJ_EXT) $(plexe) $(plc) $(plm)
 
+distclean: veryclean
+
 realclean: clean
 	-rmdir .depending
 	rm -f core $(addedbyconf) all malloc.c
-- 
1.8.3.1