X-Git-Url: https://git.sven.stormbind.net/?a=blobdiff_plain;f=debian%2Frules;h=8b07692905fc705f393c65beef3d6deb5ea93f78;hb=HEAD;hp=e5c6c5fdb6b90784605a5c7b3e24873d837614ba;hpb=c523db0107c1438c85862baa2e4a0fa7023301f4;p=sven%2Ftclcurl.git

diff --git a/debian/rules b/debian/rules
index e5c6c5f..8b07692 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,13 +3,14 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+export DEB_LDFLAGS_MAINT_PREPEND := -Wl,-z,defs -Wl,--as-needed
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
-        dh $@ --with quilt
+	dh $@
 
 override_dh_auto_configure:
-        dh_auto_configure -- \
+	dh_auto_configure -- \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
@@ -21,18 +22,21 @@ override_dh_auto_install:
 	dh_auto_install --destdir=$(CURDIR)/debian/tclcurl
 
 	mkdir $(CURDIR)/debian/tclcurl/usr/lib/tcltk
-	mv $(CURDIR)/debian/tclcurl/usr/lib/TclCurl* \
+	mv $(CURDIR)/debian/tclcurl/usr/lib/$(DEB_HOST_MULTIARCH)/TclCurl* \
 		$(CURDIR)/debian/tclcurl/usr/lib/tcltk
 	rm -rf \
 		$(CURDIR)/debian/tclcurl/usr/share/man/mann \
 		$(CURDIR)/debian/tclcurl/usr/bin \
-		$(CURDIR)/debian/tclcurl/usr/include
+		$(CURDIR)/debian/tclcurl/usr/include \
+		$(CURDIR)/debian/tclcurl/usr/lib/$(DEB_HOST_MULTIARCH)
 
 	chmod 644 \
 		$(CURDIR)/tests/*.tcl \
 		$(CURDIR)/tests/multi/double.tcl \
 		$(CURDIR)/tests/multi/single.tcl
 
+override_dh_auto_test:
+
 override_dh_makeshlibs:
 	dh_makeshlibs
 	tcltk-depends