Merge branch 'master' into smarter-targets

Conflicts:
	debhelper.pod
	debian/changelog

1 files changed, 8 insertions, 3 deletions

diff --git a/Debian/Debhelper/Buildsystem/autoconf.pm b/Debian/Debhelper/Buildsystem/autoconf.pm
index c211d8da..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/" . sourcepackage();
+	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();