diff options
Diffstat (limited to 'dh_install')
-rwxr-xr-x | dh_install | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -117,7 +117,7 @@ init(options => { my @installed; my $srcdir = '.'; -$srcdir = $dh{SOURCEDIR}."/" if defined $dh{SOURCEDIR}; +$srcdir = $dh{SOURCEDIR} if defined $dh{SOURCEDIR}; foreach my $package (@{$dh{DOPACKAGES}}) { my $tmp=tmpdir($package); @@ -151,7 +151,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { my @found = glob "$srcdir/$glob"; if (! compat(6)) { # Fall back to looking in debian/tmp. - if (! @found || ! -e $found[0]) { + if (! @found || ! (-e $found[0] || -l $found[0])) { @found = glob "debian/tmp/$glob"; } } @@ -170,11 +170,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { if (! defined $dest) { # Guess at destination directory. $dest=$src; - my $strip=$srcdir; - if ($strip eq '.') { - $strip = "debian/tmp"; - } - $dest=~s/^(.*\/)?\Q$strip\E//; + $dest=~s/^(.*\/)?(\Q$srcdir\E|debian\/tmp)\///; $dest=dirname($dest); $tmpdest=1; } |