summaryrefslogtreecommitdiff
path: root/dh_installdocs
diff options
context:
space:
mode:
authorjoeyh <joeyh>2007-01-21 17:20:14 +0000
committerjoeyh <joeyh>2007-01-21 17:20:14 +0000
commitdc2b1003057746445f5ad5a95ec9e298a221e805 (patch)
treea2edfcc5bc786e902d5b03fb3701cd1177c3c2e3 /dh_installdocs
parent90ffad95d71aec0ae98401ebc0f27d8b740f8307 (diff)
r1969: * dh_installdocs: In v5 mode, now ignore empty files even if they're hidden
away inside a subdirectory. The code missed this before. See #200905
Diffstat (limited to 'dh_installdocs')
-rwxr-xr-xdh_installdocs9
1 files changed, 6 insertions, 3 deletions
diff --git a/dh_installdocs b/dh_installdocs
index ad1c8a2..61b6599 100755
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -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 \\;");