X-Git-Url: https://git.sven.stormbind.net/?a=blobdiff_plain;f=debian%2Frules;h=5f11dee5de8f3af451716c9f2da8aaffaaab4929;hb=1e48fe33c219189cab0576051ab7f6ba1e0840cf;hp=de1946d185ecdc28ebb1a6221e9e13f70b1faa17;hpb=6b21162a41a5ab382a665fe35e0b8f7c201d3629;p=sven%2Fmysqltcl.git

diff --git a/debian/rules b/debian/rules
index de1946d..5f11dee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,10 +3,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
-	dh $@ --with quilt
+	dh $@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
@@ -16,17 +17,19 @@ override_dh_auto_configure:
 		--infodir=/usr/share/info \
 		--with-tcl=/usr/lib \
 		--with-tclinclude=/usr/include/tcl \
+		--with-mysql-lib=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_install:
 	dh_auto_install --destdir=$(CURDIR)/debian/mysqltcl
 
-	mkdir $(CURDIR)/debian/mysqltcl/usr/lib/tcltk
-	mv $(CURDIR)/debian/mysqltcl/usr/lib/mysqltcl* \
-		$(CURDIR)/debian/mysqltcl/usr/lib/tcltk
+	mkdir -p $(CURDIR)/debian/mysqltcl/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)
+	mv $(CURDIR)/debian/mysqltcl/usr/lib/$(DEB_HOST_MULTIARCH)/mysqltcl* \
+		$(CURDIR)/debian/mysqltcl/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)
 	rm -rf \
 		$(CURDIR)/debian/mysqltcl/usr/share/man/mann \
 		$(CURDIR)/debian/mysqltcl/usr/bin \
-		$(CURDIR)/debian/mysqltcl/usr/include
+		$(CURDIR)/debian/mysqltcl/usr/include \
+		$(CURDIR)/debian/mysqltcl/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_makeshlibs:
 	dh_makeshlibs