avoid depending on a dpkg that has DEB_HOST_MULTIARCH

diff --git a/Debian/Debhelper/Buildsystem/autoconf.pm b/Debian/Debhelper/Buildsystem/autoconf.pm
index 10599d14c6a80db5d15622bb68bfcdb763e06048..c211d8dacb0946c905a002fd63591efe62b4eef0 100644 (file)
--- 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();

diff --git a/debian/control b/debian/control
index 202f418031cbd767372aff96537c7cf53b14521a..cdf7489cfceddff2030db4168d2bd10fca948917 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Homepage: http://kitenet.net/~joey/code/debhelper/
 
 Package: debhelper
 Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, perl-base (>= 5.10), file (>= 3.23), dpkg-dev (>= 1.16.0), html2text, binutils, po-debconf, man-db (>= 2.5.1-1)
+Depends: ${perl:Depends}, ${misc:Depends}, perl-base (>= 5.10), file (>= 3.23), dpkg-dev (>= 1.14.19), html2text, binutils, po-debconf, man-db (>= 2.5.1-1)
 Suggests: dh-make
 Conflicts: dpkg-cross (<< 1.18), python-support (<< 0.5.3), python-central (<< 0.5.6)
 Description: helper programs for debian/rules

diff --git a/dh_makeshlibs b/dh_makeshlibs
index 5d6f869cb1442cd901a496743c1863a3929d51f7..896c5b3e3525aea036c5de874f3e3e0857c61551 100755 (executable)
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -150,7 +150,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        while (<FIND>) {
                my ($library, $major);
                push @lib_files, $_;
-               if ($multiarch ne '' && $_ =~ m,/$multiarch/,) {
+               if (defined $multiarch && $multiarch ne '' && m,/$multiarch/,) {
                        $is_multiarch=1;
                }
                my $ret=`$objdump -p $_`;