From e6591fd518e19e80947259413c22c068a1ee83b6 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 19 Mar 2017 09:22:40 +0000
Subject: [PATCH] Multiarch: Use correct M-A triplet (DEB_HOST_MULTIARCH) for
 libsubdir.  Closes:#856526.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 debian/changelog | 3 ++-
 debian/rules     | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e2ba293..3223f41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 chiark-tcl (1.2.1~) unstable; urgency=high
 
-  * 
+  * Multiarch: Use correct M-A triplet (DEB_HOST_MULTIARCH) for
+    libsubdir.  Closes:#856526.
 
  --
 
diff --git a/debian/rules b/debian/rules
index f9ed503..3675728 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,11 +26,12 @@ docdir=usr/share/doc/$(docpackage)
 tclh:=$(firstword $(wildcard /usr/include/tcl8.*/tcl.h))
 tclversion:=$(patsubst /usr/include/tcl%/tcl.h,%,$(tclh))
 
+march := $(shell dpkg-architecture -q DEB_HOST_MULTIARCH)
+libsubdir = /$(march)
+
 garch := $(shell dpkg-architecture -q DEB_HOST_GNU_TYPE)
 ifneq ($(garch),)
 
-libsubdir = /$(garch)
-
 ifeq ($(origin CC),default)
 export CC=$(garch)-gcc
 endif
-- 
2.30.2