From: Sven Hoexter <sven@timegate.de>
Date: Sat, 2 Jun 2012 17:51:10 +0000 (+0200)
Subject: Continue to move the libs to /usr/lib/tcltk/ for now against the will of the buildsys... 
X-Git-Tag: debian/7.22.0-1~3
X-Git-Url: https://git.sven.stormbind.net/?a=commitdiff_plain;h=2692de91923fb9634c444c2a22a0af7666c86016;p=sven%2Ftclcurl.git

Continue to move the libs to /usr/lib/tcltk/ for now against the will of the buildsystem. Original installation path is now architecture dependend.
---

diff --git a/debian/changelog b/debian/changelog
index b34ddb7..4e2cc53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ tclcurl (7.22.0-1) UNRELEASED; urgency=low
   * Change Standards-Version to 3.9.3 - no changes required.
   * Update copyright year and download location in debian/copyright.
   * Update homepage in debian/watch and debian/control.
+  * Continue to move the libs to /usr/lib/tcltk/ for now against
+    the will of the buildsystem. Original installation path is
+    now architecture dependend.
 
  -- Sven Hoexter <hoexter@debian.org>  Sat, 02 Jun 2012 19:02:30 +0200
 
diff --git a/debian/rules b/debian/rules
index f47ff4f..f3638f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@
 #export DH_VERBOSE=1
 
 export DEB_LDFLAGS_MAINT_PREPEND := -Wl,-z,defs -Wl,--as-needed
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
 	dh $@ --with quilt
@@ -21,12 +22,13 @@ 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 \