Merge branch 'master' into buildsystems

Conflicts:
	debian/changelog

1 files changed, 2 insertions, 1 deletions

diff --git a/dh_install b/dh_install
index c5647c6b..a8e08c2a 100755
--- a/dh_install
+++ b/dh_install
@@ -170,7 +170,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;
 			}