Multiarch: Use correct M-A triplet (DEB_HOST_MULTIARCH) for libsubdir. Closes:#856526.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index e2ba2935149f4def7833ff54cf9c69e6470f03a3..3223f416aa89b2f341f78c0ba3d262db76716a5b 100644 (file)
--- 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 f9ed503fb1637fdfe7b2cf0b3016607821366f5c..3675728eee9fcb4459de8b2e73df4b19a7bd9e8d 100755 (executable)
--- 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