summaryrefslogtreecommitdiff
path: root/Debian/Debhelper/Buildsystem
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-03-12 14:04:55 -0400
committerJoey Hess <joey@kitenet.net>2011-03-12 14:04:55 -0400
commit2bee1e2cffe4a855152cdaf9e8268b2f080e4e29 (patch)
tree1f7c7109999b2f3a6957f37fc179452d458cc0cc /Debian/Debhelper/Buildsystem
parent95644fe2554738a1c1cf25fae88d4c0c494836d2 (diff)
avoid depending on a dpkg that has DEB_HOST_MULTIARCH
Diffstat (limited to 'Debian/Debhelper/Buildsystem')
-rw-r--r--Debian/Debhelper/Buildsystem/autoconf.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/Debian/Debhelper/Buildsystem/autoconf.pm b/Debian/Debhelper/Buildsystem/autoconf.pm
index 10599d1..c211d8d 100644
--- a/Debian/Debhelper/Buildsystem/autoconf.pm
+++ b/Debian/Debhelper/Buildsystem/autoconf.pm
@@ -37,9 +37,10 @@ sub configure {
push @opts, "--infodir=\${prefix}/share/info";
push @opts, "--sysconfdir=/etc";
push @opts, "--localstatedir=/var";
- if (! compat(8)) {
- push @opts, "--libdir=\${prefix}/lib/" . dpkg_architecture_value("DEB_HOST_MULTIARCH");
- push @opts, "--libexecdir=\${prefix}/lib/" . dpkg_architecture_value("DEB_HOST_MULTIARCH") . "/" . sourcepackage();
+ 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();
}
else {
push @opts, "--libexecdir=\${prefix}/lib/" . sourcepackage();