[PATCH 2/3] Fix dpkg-architecture variables

[Guillem Jover]

---
 debian/rules |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index e30753d..99483f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,11 +14,11 @@ endif
 
 export SHLIBVER=(>= 1.2.10-1)
 
+DEB_HOST_ARCH		?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_OS	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_HOST_ARCH_CPU	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_ARCH		?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DEB_BUILD_ARCH_OS	?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
-DEB_BUILD_ARCH_CPU	?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
 
 export DEB_HOST_GNU_TYPE
 export DEB_BUILD_GNU_TYPE
@@ -57,24 +57,24 @@ else
 endif
 
 # Only build SVGA support on linux-x86 and linux-amd64
-ifneq (,$(findstring $(DEB_BUILD_ARCH),amd64 i386))
+ifneq (,$(findstring $(DEB_HOST_ARCH),amd64 i386))
   all_confflags += --enable-video-svga
 else
   all_confflags += --disable-video-svga
 endif
 # Only use NASM routines on x86 CPUs
-ifeq ($(DEB_BUILD_ARCH_CPU),i386)
+ifeq ($(DEB_HOST_ARCH_CPU),i386)
   confflags += --enable-nasm
 endif
 
 # Don't use PlayStation 3 Cell driver on powerpc
-ifeq ($(DEB_BUILD_ARCH_CPU),powerpc)
+ifeq ($(DEB_HOST_ARCH_CPU),powerpc)
   confflags += --enable-video-ps3=no \
 	       --disable-altivec
 endif
 
 # Only build ALSA support on Linux targets
-ifeq ($(DEB_BUILD_ARCH_OS),linux)
+ifeq ($(DEB_HOST_ARCH_OS),linux)
   FLAVOURS += alsa
   no_libasound =
 else
-- 
1.7.4.1


--GvXjxJ+pjyke8COw
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="0003-Fix-configure-flags.patch"