summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Langasek <steve.langasek@canonical.com>2019-02-13 08:00:29 +0000
committerSteve Langasek <steve.langasek@canonical.com>2019-02-13 08:00:29 +0000
commit303704f9f85bc9f3dcf4daf4ec6e816f4625035a (patch)
treeac3b366ff71a8896c5fcff71c37eaa226fde618e
parent7e2219d078946f4536e2186ca2c7b2d3f69b72f6 (diff)
debian/rules: set $DEB_HOST_MULTIARCH only if unset.
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 0e0fe1a8..ca14b3dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ pam (1.3.1-3) UNRELEASED; urgency=medium
to the README (should be forwarded to Debian)
* debian/libpam-modules.lintian-overrides: update for the current lintian
warning given for DSOs with no dependencies.
+ * debian/rules: set $DEB_HOST_MULTIARCH only if unset.
-- Steve Langasek <vorlon@debian.org> Wed, 13 Feb 2019 05:57:21 +0000
diff --git a/debian/rules b/debian/rules
index 3d007238..d904a227 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH_OS),hurd)
DEB_LDFLAGS_MAINT_APPEND += -lpthread
endif
-DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
LC_COLLATE=C
export LC_COLLATE