From: Anders Kaseorg Date: Thu, 15 Dec 2016 01:13:17 +0000 (-0500) Subject: Replace hard-coded x86_64-linux-gnu with DEB_HOST_MULTIARCH X-Git-Tag: debian/1.8.0_pre1-3~2 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=45dd4c4e565c5716df8bae2b136a406364748027;p=packages%2Fo%2Fopenafs.git Replace hard-coded x86_64-linux-gnu with DEB_HOST_MULTIARCH Signed-off-by: Anders Kaseorg --- diff --git a/debian/changelog b/debian/changelog index 95a2ceb25..7d616f453 100644 --- 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 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 f955bf4eb..0e04a4011 100755 --- 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