From 069cbe77b5c9e32fe461ba3921d082f13770b7f5 Mon Sep 17 00:00:00 2001
From: Benjamin-Dobell <benjamin.dobell+github@glassechidna.com.au>
Date: Wed, 8 Dec 2010 04:13:15 +1100
Subject: make install output directory can now be set via qmake variable
 FRONTENDOUTDIR It can be set like so: qmake -set FRONTENDOUTDIR
 /Desired/Out/Dir

---
 heimdall-frontend/heimdall-frontend.pro | 44 ++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 20 deletions(-)

(limited to 'heimdall-frontend')

diff --git a/heimdall-frontend/heimdall-frontend.pro b/heimdall-frontend/heimdall-frontend.pro
index 7e1049b..7e5427b 100644
--- a/heimdall-frontend/heimdall-frontend.pro
+++ b/heimdall-frontend/heimdall-frontend.pro
@@ -5,32 +5,36 @@
 TEMPLATE = app
 TARGET = heimdall-frontend
 
-macx {
-	DESTDIR = ../OSX
-} else win32 {	# It's recommended that Windows users compile via VS2010, but just in case...
-	DESTDIR = ../Win32
-} else {
-	DESTDIR = ../Linux
-}
+OUTPUTDIR = $$[FRONTENDOUTDIR]
 
 macx {
-	PROPOSEDINSTALLDIR = /Applications
-} else {
-	PROPOSEDINSTALLDIR = /usr/local/bin
-}
-
-message("Install location:" $$PROPOSEDINSTALLDIR)
-DESIREDINSTALLDIR = $$prompt("Press ENTER to use the default location or type an alternative")
+	isEqual(OUTPUTDIR, "") {
+		DESTDIR = /Applications
+	} else {
+		DESTDIR = $$OUTPUTDIR
+	}
 
-equals(DESIREDINSTALLDIR, "") {
-	target.path = $$PROPOSEDINSTALLDIR
 } else {
-	target.path = $$DESIREDINSTALLDIR
+	win32 {	# It's recommended that Windows users compile via VS2010, but just in case...
+		DESTDIR = ../Win32
+
+		!isEqual(OUTPUTDIR, "") {
+			target.path = $$OUTPUTDIR
+			INSTALLS += target
+		}
+	} else {
+		DESTDIR = ../Linux
+
+		isEqual(OUTPUTDIR, "") {
+			target.path = /usr/local/bin
+		} else {
+			target.path = $$OUTPUTDIR
+		}
+
+		INSTALLS += target
+	}
 }
 
-
-INSTALLS += target
-
 QT += core gui
 CONFIG += release
 DEFINES += QT_LARGEFILE_SUPPORT
-- 
cgit v1.1