[SCM] mixxx/master: Autodetect machine's value and pass it to SCons.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4590c0cd59eb45aac4a36ad1fb2c90142506386f
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Mar 3 13:59:55 2011 +0100

    Autodetect machine's value and pass it to SCons.

diff --git a/debian/rules b/debian/rules
index 1786f7a..a691ff3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,23 @@
 #!/usr/bin/make -f
 
-SCONS_OPTS = install_root=$(CURDIR)/debian/tmp/usr qtdir=/usr/share/qt4 prefix=/usr
 # Path to the debian directory
 DEBIAN_DIR := $(shell echo ${MAKEFILE_LIST} | awk '{print $$1}' | xargs dirname )
 UPSTREAM_VERSION ?=$(shell uscan --dehs | sed -n 's/.*<upstream-version>\(.*\)<\/upstream-version>.*/\1/p')
 PACKAGE = mixxx
 
+export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+export DEB_HOST_ARCH_OS   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+export DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+
 ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
 	SUBSTVARS = -Vdist:Depends="pulseaudio-utils"
 else
 	SUBSTVARS = -Vdist:Depends=""
 endif
 
+SCONS_OPTS = install_root=$(CURDIR)/debian/tmp/usr qtdir=/usr/share/qt4 prefix=/usr
+SCONS_OPTS += machine=$(DEB_HOST_ARCH)
+
 %:
 	dh $@ --with scour
 

-- 
mixxx packaging