diff options
Diffstat (limited to 'Debian')
| -rw-r--r-- | Debian/Debhelper/Buildsystem/autoconf.pm | 9 | ||||
| -rw-r--r-- | Debian/Debhelper/Dh_Lib.pm | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Debian/Debhelper/Buildsystem/autoconf.pm b/Debian/Debhelper/Buildsystem/autoconf.pm index d7b0bed2..f0948f36 100644 --- a/Debian/Debhelper/Buildsystem/autoconf.pm +++ b/Debian/Debhelper/Buildsystem/autoconf.pm @@ -7,7 +7,7 @@ package Debian::Debhelper::Buildsystem::autoconf; use strict; -use Debian::Debhelper::Dh_Lib qw(dpkg_architecture_value sourcepackage); +use Debian::Debhelper::Dh_Lib qw(dpkg_architecture_value sourcepackage compat); use base 'Debian::Debhelper::Buildsystem::makefile'; sub DESCRIPTION { @@ -37,7 +37,12 @@ sub configure { push @opts, "--infodir=\${prefix}/share/info"; push @opts, "--sysconfdir=/etc"; push @opts, "--localstatedir=/var"; - push @opts, "--libexecdir=\${prefix}/lib/" . sourcepackage(); + 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(); + } else { + push @opts, "--libexecdir=\${prefix}/lib/" . sourcepackage(); + } push @opts, "--disable-maintainer-mode"; push @opts, "--disable-dependency-tracking"; # Provide --host only if different from --build, as recommended in diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm index 01777210..dcba4d24 100644 --- a/Debian/Debhelper/Dh_Lib.pm +++ b/Debian/Debhelper/Dh_Lib.pm @@ -20,7 +20,7 @@ use vars qw(@ISA @EXPORT %dh); &is_make_jobserver_unavailable &clean_jobserver_makeflags &cross_command); -my $max_compat=8; +my $max_compat=9; sub init { my %params=@_; |