X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_clean;h=21114df895d29a2d68394bdaa913fd991b198e57;hb=9777b8ebd7d4e28378c474190a98af1a888d4c75;hp=9583a55b02e04190681fd2a964c86c0cc764f2e0;hpb=5221e81cc5f195b32758617409cdc39e12277b82;p=debhelper.git

diff --git a/dh_clean b/dh_clean
index 9583a55..21114df 100755
--- a/dh_clean
+++ b/dh_clean
@@ -17,9 +17,9 @@ B<dh_clean> [S<I<debhelper options>>] [B<-k>] [B<-d>] [B<-X>I<item>] [S<I<file .
 
 dh_clean is a debhelper program that is responsible for cleaning up after a
 package is built. It removes the package build directories, and removes some
-other files, such as debian/substvars, debian/files, and any detritus left
-behind by other debhelper commands (debian/*.debhelper). It also removes
-common files that should not appear in a debian diff:
+other files including debian/files, and any detritus left behind by other
+debhelper commands. It also removes common files that should not appear in a
+debian diff:
   #*# *~ DEADJOE *.orig *.rej *.SUMS TAGS core .deps/* *.P
 
 =head1 OPTIONS
@@ -64,9 +64,13 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	if (! $dh{D_FLAG}) {
 		doit("rm","-f","debian/${ext}substvars")
 			unless excludefile("debian/${ext}substvars");
+		
+		# These are all debhelper temp files, and so it is safe to 
+		# wildcard them.
+		complex_doit("rm -f debian/$ext*.debhelper");
 	}
 	
-	doit ("rm","-rf",$tmp)
+	doit ("rm","-rf",$tmp."/")
 		unless excludefile($tmp);
 }
 
@@ -80,33 +84,28 @@ if (! $dh{D_FLAG}) {
 			unless excludefile("debian/files");
 	}
 
-	# These are all debhelper temp files, and so it is safe to 
-	# wildcard them.
-	complex_doit("rm -f debian/*.debhelper");
-
 	# See if some files that would normally be deleted are excluded.
 	my $find_options='';
 	if (defined($dh{EXCLUDE_FIND}) && $dh{EXCLUDE_FIND} ne '') {
-		$find_options="-a ! ( $dh{EXCLUDE_FIND} )";
+		$find_options="! \\( $dh{EXCLUDE_FIND} \\) -a";
 	}
 
 	# Remove other temp files.
-	# (The \s+ is important, \s won't work because find would get null
-	# parameters). Note that you _don't_ quote wildcards used by find
-	# in here.
-	doit(split(/\s+/,"find . -type f -a
-	        ( -name #*# -o -name .*~ -o -name *~ -o -name DEADJOE
-		 -o -name *.orig -o -name *.rej -o -name *.bak
-		 -o -name .*.orig -o -name .*.rej -o -name .SUMS
-		 -o -name TAGS -o -name core -o ( -path */.deps/* -a -name *.P )
-		) $find_options -exec rm -f {} ;"));
+	complex_doit("find . $find_options \\( \\( -type f -a \\
+	        \\( -name '#*#' -o -name '.*~' -o -name '*~' -o -name DEADJOE \\
+		 -o -name '*.orig' -o -name '*.rej' -o -name '*.bak' \\
+		 -o -name '.*.orig' -o -name .*.rej -o -name '.SUMS' \\
+		 -o -name TAGS -o -name core -o \\( -path '*/.deps/*' -a -name '*.P' \\) \\
+		\\) -exec rm -f {} \\; \\) -o \\
+		\\( -type d -a -name autom4te.cache -prune -exec rm -rf {} \\; \\) \\)");
 }
 
-doit('rm', '-rf', 'debian/tmp') if -x 'debian/tmp' && ! compat(1);
+doit('rm', '-rf', 'debian/tmp') if -x 'debian/tmp' && ! compat(1) &&
+                                   ! excludefile("debian/tmp");
 
 =head1 SEE ALSO
 
-L<debhelper(1)>
+L<debhelper(7)>
 
 This program is a part of debhelper.