Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper

[debhelper.git] / dh_install

diff --git a/dh_install b/dh_install
index 1ea2c70880675841761e3463d5e5dfa581083b85..93986ec9ee8ec1865cdffa81d9cc03fbe914ebfc 100755 (executable)
--- a/dh_install
+++ b/dh_install
@@ -166,8 +166,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                        if (! defined $dest) {
                                # Guess at destination directory.
                                $dest=$src;
-                               $dest=~s/^(.*\/)?(\Q$srcdir\E|debian\/tmp)\///;
-                               $dest=dirname($dest);
+                               $dest=~s/^(.*\/)?\Q$srcdir\E\///;
+                               $dest=~s/^(.*\/)?debian\/tmp\///;
+                               $dest=dirname("/".$dest);
                                $tmpdest=1;
                        }