chiark / gitweb /
Multiarch: Use correct M-A triplet (DEB_HOST_MULTIARCH) for libsubdir. Closes:#856526.
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 19 Mar 2017 09:22:40 +0000 (09:22 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 19 Mar 2017 09:22:43 +0000 (09:22 +0000)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
debian/changelog
debian/rules

index e2ba293..3223f41 100644 (file)
@@ -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.
 
  --
 
index f9ed503..3675728 100755 (executable)
@@ -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