Replace hard-coded x86_64-linux-gnu with DEB_HOST_MULTIARCH

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

diff --git a/debian/changelog b/debian/changelog
index 95a2ceb254e08a5ffe1b3f2a8a0aaec9b3dc54dd..7d616f4537d36dfad342f5df9a6dd2495ce98128 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openafs (1.8.0~pre1-3) UNRELEASED; urgency=medium
+
+  * Replace hard-coded x86_64-linux-gnu with DEB_HOST_MULTIARCH.
+
+ -- Anders Kaseorg <andersk@mit.edu>  Wed, 14 Dec 2016 20:12:48 -0500
+
 openafs (1.8.0~pre1-2) experimental; urgency=medium
 
   * Move libtool, heimdal-multidev from Build-Depends-Indep to

diff --git a/debian/rules b/debian/rules
index f955bf4eb54abcd1425fdea8cba8a1e394694295..0e04a4011163fc99283fca2b9da5a1872c93e355 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 # Tell Autoconf the correct system types.
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
@@ -106,11 +107,11 @@ override_dh_auto_configure:
            --with-docbook2pdf=dblatex --with-xslt-processor=xsltproc      \
            --with-html-xsl=$(HTML_XSL)                                    \
            --with-krb5-include=/usr/include/mit-krb5                      \
-           --with-krb5-lib=/usr/lib/x86_64-linux-gnu/mit-krb5             \
+           --with-krb5-lib=/usr/lib/$(DEB_HOST_MULTIARCH)/mit-krb5        \
            --with-roken-include=/usr/include/heimdal                      \
-           --with-roken-lib=/usr/lib/x86_64-linux-gnu/heimdal             \
+           --with-roken-lib=/usr/lib/$(DEB_HOST_MULTIARCH)/heimdal        \
            --with-hcrypto-include=/usr/include/heimdal                    \
-           --with-hcrypto-lib=/usr/lib/x86_64-linux-gnu/heimdal           \
+           --with-hcrypto-lib=/usr/lib/$(DEB_HOST_MULTIARCH)/heimdal      \
            $(DEBIAN_OPT_FLAGS) $(SYSTEM)
 
 # Also build a libafs_tree and build the XML documentation if building