Merge branch 'master' into buildsystems

[debhelper.git] / dh_install

diff --git a/dh_install b/dh_install
index 86a868bf66c80e2dc4095dfb14726d6e7d1c2220..c5647c6b7ba693b28a9edeed17941c2f768e12b8 100755 (executable)
--- a/dh_install
+++ b/dh_install
@@ -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,12 +170,8 @@ 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=dirname($dest);
+                               $dest=~s/^(.*\/)?(\Q$srcdir\E|debian\/tmp)\///;
+                               $dest=dirname("/".$dest);
                                $tmpdest=1;
                        }