summaryrefslogtreecommitdiff
path: root/dh_install
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-07-14 17:08:23 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-07-14 17:08:23 -0400
commitf2bd791e8b07447e395e018331ff1f8c7757b4d6 (patch)
treeec63e6fcb11dd9b6128044155c406f3b0b1a9290 /dh_install
parent0cec46a017d11c8967a7ea5cb1082e9abfa6dc7b (diff)
dh_install: Fix support for the case where --sourcedir=debian/tmp/foo is used. Perl was not being greedy enough and the 'foo' was not stripped from the destination directory in this unusual case. Closes: #537017
Diffstat (limited to 'dh_install')
-rwxr-xr-xdh_install3
1 files changed, 2 insertions, 1 deletions
diff --git a/dh_install b/dh_install
index 2a5a591..eb196e5 100755
--- a/dh_install
+++ b/dh_install
@@ -166,7 +166,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
if (! defined $dest) {
# Guess at destination directory.
$dest=$src;
- $dest=~s/^(.*\/)?(\Q$srcdir\E|debian\/tmp)\///;
+ $dest=~s/^(.*\/)?\Q$srcdir\E\/// ||
+ $dest=~s/^(.*\/)?debian\/tmp\///;
$dest=dirname("/".$dest);
$tmpdest=1;
}