From f2bd791e8b07447e395e018331ff1f8c7757b4d6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 14 Jul 2009 17:08:23 -0400
Subject: dh_install: Fix support for the case where --sourcedir=debian/tmp/foo
 is used. Perl was not being greedy enough and the 'foo' was not stripped from
 the destination directory in this unusual case. Closes: #537017

---
 dh_install | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'dh_install')

diff --git a/dh_install b/dh_install
index 2a5a5911..eb196e5c 100755
--- a/dh_install
+++ b/dh_install
@@ -166,7 +166,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;
 			}
-- 
cgit v1.2.3