summaryrefslogtreecommitdiffstats
path: root/debian/squeeze
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-12 15:07:29 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-07-23 23:17:07 +0200
commit0ef210139644bfe0cb2a6f3bdc954203c7a990e2 (patch)
tree1d61997c8ffe054a4a9aca00b10ed1f40bca688e /debian/squeeze
parente2081c06f4922e607f6760182212403fc7f41c3c (diff)
downloadtde-packaging-0ef210139644bfe0cb2a6f3bdc954203c7a990e2.tar.gz
tde-packaging-0ef210139644bfe0cb2a6f3bdc954203c7a990e2.zip
Fix qt3/tqt3 multiarch on Debian and Ubuntu
This closes Bug 712 (cherry picked from commit 2754bcd23508e2e785201702a30e1f5b3c967806)
Diffstat (limited to 'debian/squeeze')
-rwxr-xr-xdebian/squeeze/dependencies/qt3/debian/rules4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/squeeze/dependencies/qt3/debian/rules b/debian/squeeze/dependencies/qt3/debian/rules
index 33e663832..aa0b84dfe 100755
--- a/debian/squeeze/dependencies/qt3/debian/rules
+++ b/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 \