X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=debian%2Frules;h=f065f68d4fb414ce649dab7becf63a018650d15e;hb=073d42ed287d96c105bd2e79333c5021bd43e210;hp=f5d4a2af04e6afb48f73af376bb78eb5ff02a622;hpb=190fdf431e65f0276ce3c8c566248582f7c95abe;p=chiark-tcl.git

diff --git a/debian/rules b/debian/rules
index f5d4a2a..f065f68 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,11 @@ docdir=usr/share/doc/$(docpackage)
 tclh:=$(firstword $(wildcard /usr/include/tcl8.*/tcl.h))
 tclversion:=$(patsubst /usr/include/tcl%/tcl.h,%,$(tclh))
 
+tcl_versions= 8.5 8.6 8.7
+
+march := $(shell dpkg-architecture -q DEB_HOST_MULTIARCH)
+libsubdir = /$(march)
+
 garch := $(shell dpkg-architecture -q DEB_HOST_GNU_TYPE)
 ifneq ($(garch),)
 
@@ -57,7 +62,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 +71,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				\
@@ -101,4 +106,8 @@ checkroot:
 	$(checkdir)
 	dh_testroot
 
+debian/tests/control: debian/regenerate-autopkgtests debian/rules
+	$(MAKE) debian-substvars
+	$< $(tcl_versions)
+
 .PHONY: binary binary-arch binary-indep clean checkroot