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

[debhelper.git] / dh_install

diff --git a/dh_install b/dh_install
index c5647c6b7ba693b28a9edeed17941c2f768e12b8..292837b4a0594165ac208ea198f6d1cf8a16e32c 100755 (executable)
--- a/dh_install
+++ b/dh_install
@@ -159,7 +159,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                }
 
                if (! compat(4)) { # check added in v5
-                       # glob now, relative to srcdir
                        if (! @filelist) {
                                error("$package missing files (@$set), aborting");
                        }
@@ -170,7 +169,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;
                        }