dh_install: Fix use of debian/tmp in v7 mode; a bug caused it to put files inside a debian/tmp directory in the package build directory, now that prefix is stripped. (See #534565)

(This also includes a fix to avoid doubled slashes in paths passed to
commands.)

1 files changed, 2 insertions, 6 deletions

diff --git a/dh_install b/dh_install
index 3d9a562d..1ea2c708 100755
--- a/dh_install
+++ b/dh_install
@@ -113,7 +113,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);
@@ -166,11 +166,7 @@ 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=~s/^(.*\/)?(\Q$srcdir\E|debian\/tmp)\///;
 				$dest=dirname($dest);
 				$tmpdest=1;
 			}