Multiarch: Move .so's to triplet paths, and declare M-A: same.

diff --git a/debian/changelog b/debian/changelog
index 706198ff91da781ad31c619497d5e7c2f0d6191a..91dbcfdced98f29bc173b721419d61df4adb00d9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ chiark-tcl (1.1.4~~iwj) UNRELEASED; urgency=low
   * Update build-dependencies to permit tcl8.6.  Closes:#818475.
   * Replace ad-hocery with use of offsetof/typeof.  Closes:#812718.
   * Honour dpkg-architecture's DEB_HOST_GNU_TYPE, to fix cross-building.
+  * Multiarch: Move .so's to triplet paths, and declare M-A: same.
 
  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Tue, 24 Jan 2017 13:14:06 +0000
 

diff --git a/debian/control b/debian/control
index 81e7675c343afefbb270dfd3e90e4589edc41fac..9465cb17eab325e0bf15d18ac5d365b16e6b94a0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Description: Tcl interfaces for adns, cdb, crypto, etc.
  To use the adns and nettle bindings you need to have the
  appropriate libraries installed too.
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-arch: same
 
 
 # chiark-tcl - various Tcl bindings and extensions

diff --git a/debian/rules b/debian/rules
index f5d4a2af04e6afb48f73af376bb78eb5ff02a622..f9ed503fb1637fdfe7b2cf0b3016607821366f5c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,8 @@ tclversion:=$(patsubst /usr/include/tcl%/tcl.h,%,$(tclh))
 garch := $(shell dpkg-architecture -q DEB_HOST_GNU_TYPE)
 ifneq ($(garch),)
 
+libsubdir = /$(garch)
+
 ifeq ($(origin CC),default)
 export CC=$(garch)-gcc
 endif
@@ -57,7 +59,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                                         \
@@ -66,7 +68,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                             \