summaryrefslogtreecommitdiff
path: root/dh_install
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-07-15 09:50:47 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-07-15 09:50:47 -0400
commitd92a7906608dcf6c697e912f73376c7f6b030fa8 (patch)
treec93b14ad35563c0f172101311db1ea688eca2903 /dh_install
parentfba7d9e67576b17ed5eb4da99e5d1882549b5985 (diff)
parent452b7e6a61be42b2c345cdeeb00fbe51f88fce32 (diff)
Merge branch 'master' into buildsystems
Conflicts: debian/changelog
Diffstat (limited to 'dh_install')
-rwxr-xr-xdh_install4
1 files changed, 2 insertions, 2 deletions
diff --git a/dh_install b/dh_install
index a8e08c2..eb48502 100755
--- a/dh_install
+++ b/dh_install
@@ -170,8 +170,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
if (! defined $dest) {
# Guess at destination directory.
$dest=$src;
- $dest=~s/^(.*\/)?\Q$srcdir\E\/// ||
- $dest=~s/^(.*\/)?debian\/tmp\///;
+ $dest=~s/^(.*\/)?\Q$srcdir\E\///;
+ $dest=~s/^(.*\/)?debian\/tmp\///;
$dest=dirname("/".$dest);
$tmpdest=1;
}