summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-12 15:07:29 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-12 15:07:29 -0600
commit2754bcd23508e2e785201702a30e1f5b3c967806 (patch)
tree8adc753b1abaee8788300675b8bbfe752165d87b /ubuntu
parent9c1a064fac4142d060b563f655e3f42f5ad52cb8 (diff)
downloadtde-packaging-2754bcd23508e2e785201702a30e1f5b3c967806.tar.gz
tde-packaging-2754bcd23508e2e785201702a30e1f5b3c967806.zip
Fix qt3/tqt3 multiarch on Debian and Ubuntu
This closes Bug 712
Diffstat (limited to 'ubuntu')
-rwxr-xr-xubuntu/maverick/dependencies/qt3/debian/rules4
-rwxr-xr-xubuntu/maverick/dependencies/tqt3/debian/rules4
2 files changed, 4 insertions, 4 deletions
diff --git a/ubuntu/maverick/dependencies/qt3/debian/rules b/ubuntu/maverick/dependencies/qt3/debian/rules
index 15bf23569..0d2c1e5a0 100755
--- a/ubuntu/maverick/dependencies/qt3/debian/rules
+++ b/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 \
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/rules b/ubuntu/maverick/dependencies/tqt3/debian/rules
index df3786fb1..93e27e91e 100755
--- a/ubuntu/maverick/dependencies/tqt3/debian/rules
+++ b/ubuntu/maverick/dependencies/tqt3/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 \