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: [PATCH] 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 ++++++++---
 debhelper.pod                            |  5 +++++
 debian/changelog                         |  2 ++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Debian/Debhelper/Buildsystem/autoconf.pm b/Debian/Debhelper/Buildsystem/autoconf.pm
index 1fbc80d..20b9fd4 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();
diff --git a/debhelper.pod b/debhelper.pod
index 9939ea1..d61cc84 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -550,6 +550,11 @@ while B<dh_makeshlibs> detects packages containing multiarch
 directories and sets a Pre-Dependency on multiarch-support in
 ${misc:Pre-Depends}
 
+=item -
+
+B<dh_auto_configure> does not include the source package name
+in --libexecdir when using autoconf.
+
 =back
 
 =back
diff --git a/debian/changelog b/debian/changelog
index 8404462..35692da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ debhelper (8.1.7) UNRELEASED; urgency=low
   * Fix example. Closes: #627534
   * Fix error message. Closes: #628053
   * dh_movefiles: Optimise use of xargs. Closes: #627737
+  * dh_auto_configure: In v9, does not include the source package name
+    in --libexecdir when using autoconf. Closes: #541458
 
  -- Joey Hess <joeyh@debian.org>  Sat, 21 May 2011 15:24:19 -0400
 
-- 
2.39.5