r1843: * dh_link: add special case handling for paths to a directory containing the

[debhelper.git] / dh_installdocs

diff --git a/dh_installdocs b/dh_installdocs
index 52d1675fb7ff787c17603ef38b0953a7099005cd..ad1c8a2c5911273b8f75f06e9a6bbae1916227dc 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 ...>
 
@@ -127,13 +127,13 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                }
                foreach my $doc (@docs) {
                        next if excludefile($doc);
-                       next if ! -s $doc && ! compat(4); # ignore empty BUGS, etc
+                       next if -e $doc && ! -s $doc && ! compat(4); # ignore empty BUGS, etc
                        if (-d $doc && $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$exclude -exec cp --parents -dp {} $pwd/$tmp/usr/share/doc/$package \\;");
+                           complex_doit("cd $doc/.. && find $dir_basename \\( -type f -or -type l \\)$exclude -exec cp --parents -dp {} $pwd/$tmp/usr/share/doc/$package \\;");
                        }
                        else {
                                doit("cp","-a",$doc,"$tmp/usr/share/doc/$package");
@@ -198,6 +198,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        foreach my $fn (grep {/^${regexp}doc-base(\..*)?$/} readdir(DEB)) {
                # .EX are example files, generated by eg, dh-make
                next if $fn=~/\.EX$/;
+               next if excludefile($fn);
                # Parse the file to get the doc id.
                open (IN, "debian/$fn") || die "Cannot read debian/$fn.";
                while (<IN>) {