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

[chiark-tcl.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index faa763a91b3e1456da41e07357b9a82e80f2e757..3675728eee9fcb4459de8b2e73df4b19a7bd9e8d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,18 @@ 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),)
+
+ifeq ($(origin CC),default)
+export CC=$(garch)-gcc
+endif
+
+endif # $garch
+
 define checkdir
        test -f hbytes/hbytes.tct
 endef
@@ -48,7 +60,7 @@ binary-indep:
 binary-arch:   checkroot build
        $(checkdir)
        -rm -rf debian/$(docpackage) debian/$(libpackage)
-       install -d debian/$(libpackage)/usr/lib
+       install -d debian/$(libpackage)/usr/lib$(libsubdir)
        install -d debian/$(docpackage)/usr/share/doc/$(docpackage)
 
        set -e; for f in lintian; do                                         \
@@ -57,7 +69,7 @@ binary-arch:  checkroot build
                 debian/$(libpackage)/usr/share/$$f/overrides/$(libpackage); \
                done
 
-       cp */*.so debian/$(libpackage)/usr/lib/.
+       cp */*.so debian/$(libpackage)/usr/lib$(libsubdir)/.
 
        set -e; for f in */*.[ch]; do                                   \
                perl debian/extractdoc <$$f                             \