r2011: releasing version 5.0.51

[debhelper.git] / dh_installdocs

diff --git a/dh_installdocs b/dh_installdocs
index 52ad21d0b84d7583b3498bbe03067e51c1cfe548..61b65996e909ef288743e641c1ee7bbfd63fbd76 100755 (executable)
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -64,7 +64,7 @@ Do not modify postinst/prerm scripts.
 =item B<-Xitem>, B<--exclude=item>
 
 Exclude files that contain "item" anywhere in their filename from
-being installed.
+being installed. Note that this includes doc-base files.
 
 =item I<file ...>
 
@@ -125,12 +125,15 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                if ($dh{EXCLUDE_FIND}) {
                        $exclude = ' -and ! \( '.$dh{EXCLUDE_FIND}.' \)';
                }
+               if (! compat(4)) {
+                       # ignore empty files in subdirs
+                       $exclude .= ' -and ! -empty';
+               }
                foreach my $doc (@docs) {
                        next if excludefile($doc);
-                       next if -e $doc && ! -s $doc && ! compat(4); # ignore empty BUGS, etc
-                       if (-d $doc && $exclude) {
+                       next if -e $doc && ! -s $doc && ! compat(4); # ignore empty files
+                       if (-d $doc && length $exclude) {
                            my ($dir_basename) = basename($doc);
-                           # Pity there's no cp --exclude ..
                            my $pwd=`pwd`;
                            chomp $pwd;
                            complex_doit("cd $doc/.. && find $dir_basename \\( -type f -or -type l \\)$exclude -exec cp --parents -dp {} $pwd/$tmp/usr/share/doc/$package \\;");