From 9e4341d34daca3d00a0866a259162f3d55407231 Mon Sep 17 00:00:00 2001
From: Roger Leigh <rleigh@debian.org>
Date: Tue, 14 Jun 2011 20:43:03 +0100
Subject: Don't add package name to libexecdir in v9

---
 Debian/Debhelper/Buildsystem/autoconf.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Debian/Debhelper/Buildsystem')

diff --git a/Debian/Debhelper/Buildsystem/autoconf.pm b/Debian/Debhelper/Buildsystem/autoconf.pm
index c211d8da..1fbc80de 100644
--- a/Debian/Debhelper/Buildsystem/autoconf.pm
+++ b/Debian/Debhelper/Buildsystem/autoconf.pm
@@ -40,7 +40,7 @@ sub configure {
 	my $multiarch=dpkg_architecture_value("DEB_HOST_MULTIARCH");
 	if (! compat(8) && defined $multiarch) {
 		push @opts, "--libdir=\${prefix}/lib/$multiarch";
-		push @opts, "--libexecdir=\${prefix}/lib/$multiarch/" . sourcepackage();
+		push @opts, "--libexecdir=\${prefix}/lib/$multiarch";
 	}
 	else {
 		push @opts, "--libexecdir=\${prefix}/lib/" . sourcepackage();
-- 
cgit v1.2.3


From cbe68c8579e8abc03aeff939306b2d34cb1fe8ac Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 14 Jun 2011 16:14:56 -0400
Subject: dh_auto_configure: In v9, does not include the source package name in
 --libexecdir when using autoconf. Closes: #541458

Fixed rleigh's patch to be more correct in the edge case where there is
a non-multiarch dpkg (ie, backports).
---
 Debian/Debhelper/Buildsystem/autoconf.pm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'Debian/Debhelper/Buildsystem')

diff --git a/Debian/Debhelper/Buildsystem/autoconf.pm b/Debian/Debhelper/Buildsystem/autoconf.pm
index 1fbc80de..20b9fd44 100644
--- a/Debian/Debhelper/Buildsystem/autoconf.pm
+++ b/Debian/Debhelper/Buildsystem/autoconf.pm
@@ -38,9 +38,14 @@ sub configure {
 	push @opts, "--sysconfdir=/etc";
 	push @opts, "--localstatedir=/var";
 	my $multiarch=dpkg_architecture_value("DEB_HOST_MULTIARCH");
-	if (! compat(8) && defined $multiarch) {
-		push @opts, "--libdir=\${prefix}/lib/$multiarch";
-		push @opts, "--libexecdir=\${prefix}/lib/$multiarch";
+	if (! compat(8)) {
+	       if (defined $multiarch) {
+			push @opts, "--libdir=\${prefix}/lib/$multiarch";
+			push @opts, "--libexecdir=\${prefix}/lib/$multiarch";
+		}
+		else {
+			push @opts, "--libexecdir=\${prefix}/lib";
+		}
 	}
 	else {
 		push @opts, "--libexecdir=\${prefix}/lib/" . sourcepackage();
-- 
cgit v1.2.3