r1990: releasing version 5.0.46

[debhelper.git] / dh_clean

diff --git a/dh_clean b/dh_clean
index d4c5943a102437fe211c828d45b297a31d8530d0..18c298df20e224bcbde7e0327af695c4a4950de6 100755 (executable)
--- a/dh_clean
+++ b/dh_clean
@@ -87,26 +87,21 @@ if (! $dh{D_FLAG}) {
        # 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 {} ;"));
-
-       # Stupid autoconf cache directory.
-       doit("rm", "-rf", "autom4te.cache")
-               unless excludefile("autom4te.cache");
+       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