X-Git-Url: https://git.sven.stormbind.net/?a=blobdiff_plain;f=debian%2Frules;h=b4e6f89402db492fb32264a1c36dffac0fac3075;hb=6721c58679cb74b6dee63e43c73afe4f59228399;hp=292ecc9d063aa148a5ffe9810833e11ba1f83f2c;hpb=142e95dfafeb99191e3ca4e3a8af386fe50dae2a;p=sven%2Fmysqltcl.git

diff --git a/debian/rules b/debian/rules
index 292ecc9..b4e6f89 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,14 @@
 # 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
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
-	dh $@ --with quilt,autoreconf
+	dh $@ --with quilt
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
@@ -22,13 +25,14 @@ override_dh_auto_configure:
 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