[Pkg-kde-commits] rev 1318 - people/chrsmrtn/qt-x11-free/debian

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-07-17 18:39:42 +0000 (Sun, 17 Jul 2005)
New Revision: 1318

Modified:
   people/chrsmrtn/qt-x11-free/debian/rules
Log:
Sync with dato.


Modified: people/chrsmrtn/qt-x11-free/debian/rules
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/rules	2005-07-17 02:50:59 UTC (rev 1317)
+++ people/chrsmrtn/qt-x11-free/debian/rules	2005-07-17 18:39:42 UTC (rev 1318)
@@ -11,8 +11,8 @@
 OLD_PATH := $(PATH)
 export PATH=$(QTDIR)/bin:$(OLD_PATH)
 
-DEB_BUILD_GNU_CPU   ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-DEB_HOST_ARCH       ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH		?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_CPU	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
 # dpatch stuff
 include /usr/share/dpatch/dpatch.make
@@ -98,11 +98,11 @@
 		# End of CONFIGURE_OPTS
 		# TODO: Styles as plugins?
 
-ifeq ($(DEB_BUILD_GNU_ARCH),i386)
+ifneq ($(DEB_HOST_ARCH_CPU),i386)
+	CONFIGURE_OPTS += -no-sql-ibase
+	IBASE = -Nlibqt3c102-mt-ibase
+else
 	IBASE =
-else
-	IBASE = -Nlibqt3c102-mt-ibase
-	CONFIGURE_OPTS += -no-sql-ibase
 endif
 
 ifeq ($(DEB_HOST_ARCH),arm)