From 264d76382bca306eca4e13fdf4a6ec87df9578cc Mon Sep 17 00:00:00 2001
From: Stacey Sheldon <stac@solidgoldbomb.org>
Date: Sun, 16 Dec 2012 02:14:34 -0500
Subject: [PATCH] makefile: allow arch-specific path to qmake

This will be required once we move to Qt5.
---
 Makefile      | 4 ++--
 make/tools.mk | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 713c105c9..bed8b91a6 100644
--- a/Makefile
+++ b/Makefile
@@ -185,10 +185,10 @@ $(BUILD_DIR):
 ##############################
 
 ifeq ($(shell [ -d "$(QT_SDK_DIR)" ] && echo "exists"), exists)
-  QMAKE=$(QT_SDK_DIR)/Desktop/Qt/4.8.1/gcc/bin/qmake
+  QMAKE = $(QT_SDK_QMAKE_PATH)
 else
   # not installed, hope it's in the path...
-  QMAKE=qmake
+  QMAKE = qmake
 endif
 
 ifeq ($(shell [ -d "$(ARM_SDK_DIR)" ] && echo "exists"), exists)
diff --git a/make/tools.mk b/make/tools.mk
index 49e58066f..25ad92e4f 100644
--- a/make/tools.mk
+++ b/make/tools.mk
@@ -14,10 +14,12 @@ QT_SDK_DIR := $(TOOLS_DIR)/qtsdk-v1.2.1
 # Choose the appropriate installer based on host architecture
 ifneq (,$(filter $(ARCH), x86_64 amd64))
 # 64-bit
+QT_SDK_QMAKE_PATH := $(QT_SDK_DIR)/Desktop/Qt/4.8.1/gcc/bin/qmake
 qt_sdk_install: QT_SDK_FILE := QtSdk-offline-linux-x86_64-v1.2.1.run
 qt_sdk_install: QT_SDK_URL := http://www.developer.nokia.com/dp?uri=http://sw.nokia.com/id/14b2039c-0e1f-4774-a4f2-9aa60b6d5313/Qt_SDK_Lin64_offline
 else
 # 32-bit
+QT_SDK_QMAKE_PATH := $(QT_SDK_DIR)/Desktop/Qt/4.8.1/gcc/bin/qmake
 qt_sdk_install: QT_SDK_URL  := http://www.developer.nokia.com/dp?uri=http://sw.nokia.com/id/8ea74da4-fec1-4277-8b26-c58cc82e204b/Qt_SDK_Lin32_offline
 qt_sdk_install: QT_SDK_FILE := QtSdk-offline-linux-x86-v1.2.1.run
 endif