diff options
author | Joey Hess <joey@kitenet.net> | 2011-06-14 16:14:56 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2011-06-14 16:14:56 -0400 |
commit | cbe68c8579e8abc03aeff939306b2d34cb1fe8ac (patch) | |
tree | fec3151060f4324afb86fe5f90cca94e5f60a3f4 /Debian/Debhelper | |
parent | 9e4341d34daca3d00a0866a259162f3d55407231 (diff) |
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).
Diffstat (limited to 'Debian/Debhelper')
-rw-r--r-- | Debian/Debhelper/Buildsystem/autoconf.pm | 11 |
1 files changed, 8 insertions, 3 deletions
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(); |