Fix qt3/tqt3 multiarch on Debian and Ubuntu

This closes Bug 712
(cherry picked from commit 2754bcd235)

debian/lenny/dependencies/qt3/debian/rules

@@ -13,6 +13,7 @@ export PATH=$(QTDIR)/bin:$(OLD_PATH)
 
 DEB_HOST_ARCH		?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_ARCH_CPU	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 ifeq ($(DEB_HOST_ARCH_OS),hurd)
 	PLATFORM_ARG = hurd-g++
@@ -90,8 +91,7 @@ CONFIGURE_OPTS = \
 		-I/usr/include/mysql		\
 		-I/usr/include/freetype2	\
 		-I`pg_config --includedir`	\
-						\
-		-L/usr/lib/$(DEB_HOST_MULTIARCH)	\
+		-L/usr/lib/$(DEB_HOST_MULTIARCH)\
 						\
 		-lfontconfig			\
 		-inputmethod			\

debian/squeeze/dependencies/qt3/debian/rules

@@ -13,6 +13,7 @@ export PATH=$(QTDIR)/bin:$(OLD_PATH)
 
 DEB_HOST_ARCH		?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_ARCH_CPU	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 ifeq ($(DEB_HOST_ARCH_OS),hurd)
 	PLATFORM_ARG = hurd-g++
@@ -90,8 +91,7 @@ CONFIGURE_OPTS = \
 		-I/usr/include/mysql		\
 		-I/usr/include/freetype2	\
 		-I`pg_config --includedir`	\
-						\
-		-L/usr/lib/$(DEB_HOST_MULTIARCH)	\
+		-L/usr/lib/$(DEB_HOST_MULTIARCH)\
 						\
 		-lfontconfig			\
 		-inputmethod			\

ubuntu/maverick/dependencies/qt3/debian/rules

@@ -13,6 +13,7 @@ export PATH=$(QTDIR)/bin:$(OLD_PATH)
 
 DEB_HOST_ARCH		?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_ARCH_CPU	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 ifeq ($(DEB_HOST_ARCH_OS),hurd)
 	PLATFORM_ARG = hurd-g++
@@ -90,8 +91,7 @@ CONFIGURE_OPTS = \
 		-I/usr/include/mysql		\
 		-I/usr/include/freetype2	\
 		-I`pg_config --includedir`	\
-						\
-		-L/usr/lib/$(DEB_HOST_MULTIARCH)	\
+		-L/usr/lib/$(DEB_HOST_MULTIARCH)\
 						\
 		-lfontconfig			\
 		-inputmethod			\