d/rules: multiarch path adjustment.

diff --git a/debian/changelog b/debian/changelog
index f43989dd6baa1de6de79338b48ca411413a67841..b4573bd8a4b81e2b19ff0a5ed89fc2ebab53bf2c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ mysqltcl (3.052-1) unstable; urgency=low
   * Increment Standards-Version to 3.9.6 - no changes required.
   * Increment dh compat level to 9, build-depend on debhelper 9.
   * Remove versioned b-d on libmysqlclient-dev, remove b-d on dpkg-dev.
+  * d/rules: multiarch path adjustment.
 
  -- Sven Hoexter <hoexter@debian.org>  Mon, 22 Sep 2014 18:20:17 +0200
 

diff --git a/debian/rules b/debian/rules
index 571e38bc4bed55b9304517452dc1286437f52e60..f4e88a287624219433931d89222c72298f5b1db7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -24,13 +24,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