From d06bade246d77f83c270743b87245ef3d883d3a6 Mon Sep 17 00:00:00 2001
From: Marcus Holland-Moritz <mhx-perl@gmx.net>
Date: Thu, 18 Jan 2007 15:27:55 +0100
Subject: [PATCH] Integrate: [ 27201] Remove lib/Hash directory when doing make
 distclean

[ 28482]
Make the distclean target remove lib/Hash correctly

[ 28615]
Very recent development versions of gcc (4.2.0 20060715) seem
to have switched from '<command line>' to '<command-line>'.

[ 29871]
perl rebuilds because of gcc's -g flag
Subject: [PATCH] Re: [perl #41058] make rebuilds perl everytime
Message-ID: <20070118142755.28e7f724@r2d2>
p4raw-link: @29871 on //depot/perl: a3d1be69db4c082c1b9cef14f51a6e7fe4a9dac9
p4raw-link: @28615 on //depot/perl: cf14425e2bd169ce935f76d359f3253b51e441a0
p4raw-link: @28482 on //depot/perl: 01f2eac450f9dfc91c650462d75a6bc8d7a0c65b
p4raw-link: @27201 on //depot/perl: 45812765cccbfdc897c33c3834bf546fc25c90ab

p4raw-id: //depot/maint-5.8/perl@30206
p4raw-integrated: from //depot/perl@30205 'copy in' makedepend.SH
	(@28615..)
p4raw-integrated: from //depot/perl@28482 'edit in' Makefile.SH
	(@28471..)
---
 Makefile.SH   | 4 ++--
 makedepend.SH | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile.SH b/Makefile.SH
index 28d7599..410842a 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -1130,13 +1130,13 @@ _cleaner2:
 	rm -rf .config
 	rm -f preload
 	rm -f testcompile compilelog
-	rm -rf lib/Encode
+	rm -rf lib/Encode lib/Hash
 	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)
 	-rmdir lib/B lib/Data
 	-rmdir lib/Filter/Util lib/IO/Socket lib/IO
-	-rmdir lib/List lib/MIME lib/Scalar lib/Sys 
+	-rmdir lib/List lib/MIME lib/Scalar lib/Sys
 	-rmdir lib/threads lib/XS
 
 _realcleaner:
diff --git a/makedepend.SH b/makedepend.SH
index 688f656..f85ce44 100755
--- a/makedepend.SH
+++ b/makedepend.SH
@@ -167,7 +167,9 @@ for file in `$cat .clist`; do
             -e '/^#.*<builtin>/d' \
             -e '/^#.*<built-in>/d' \
             -e '/^#.*<command line>/d' \
+            -e '/^#.*<command-line>/d' \
 	    -e '/^#.*"-"/d' \
+	    -e '/^#.*"\/.*\/"/d' \
 	    -e '/: file path prefix .* never used$/d' \
 	    -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \
 	    -e 's/^[	 ]*#[	 ]*line/#/' \
-- 
1.8.3.1