diff options
Diffstat (limited to 'dh_install')
| -rwxr-xr-x | dh_install | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -100,7 +100,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { @install=filedoublearray($file); # no globbing yet } - $srcdir = $dh{SOURCEDIR} if defined $dh{SOURCEDIR}; + $srcdir = $dh{SOURCEDIR}."/" if defined $dh{SOURCEDIR}; if (($package eq $dh{FIRSTPACKAGE} || $dh{PARAMS_ALL}) && @ARGV) { push @install, [@ARGV]; @@ -118,8 +118,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) { if (! defined $dh{AUTODEST} && @$set > 1) { $dest=pop @$set; } - - foreach my $src (map { glob } @$set) { # glob now + # glob now, relative to srcdir + foreach my $src (map { glob "$srcdir/$_" } @$set) { next if excludefile($src); if (! defined $dest) { @@ -129,8 +129,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) { $dest=dirname($dest); } - $src = "$srcdir/$src"; # do this now, to avoid the parsing above - # Make sure the destination directory exists. if (! -e "$tmp/$dest") { doit("install","-d","$tmp/$dest"); |