about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2016-03-13 20:45:24 +0100
committerMichael Biebl <biebl@debian.org>2016-03-13 20:49:55 +0100
commit18312071fb593d896dcebd018642d1525dc24304 (patch)
treeba63def6e7553e88d5b6f6936ceb721dae0f6efb
parent24916d2987db9fb3b4dfea9698bb33b66f5eb5db (diff)
Use the architecture.mk Makefile snippet
provided by dpkg-dev to retrieve DEB_HOST_MULTIARCH.
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/rules2
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index c7ab6cc3..d2fdaa1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ network-manager (1.1.91-2) UNRELEASED; urgency=medium
   * Skip the test suite if "nocheck" is set via DEB_BUILD_OPTIONS.
   * Mark the Build-Depends which are required to run the test suite with
     <!nocheck>.
+  * Use the architecture.mk Makefile snippet provided by dpkg-dev to retrieve
+    DEB_HOST_MULTIARCH.
 
  -- Michael Biebl <biebl@debian.org>  Tue, 01 Mar 2016 21:34:04 +0100
 
diff --git a/debian/rules b/debian/rules
index eb155412..b0f4f2db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+include /usr/share/dpkg/architecture.mk
 
 PPPD_PLUGIN_DIR := $(shell dh_ppp --plugin-dir)