summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPino Toscano <toscano.pino@tiscali.it>2014-12-30 23:37:56 +0100
committerThiago Macieira <thiago.macieira@intel.com>2015-01-02 20:05:43 +0100
commit4360ffb48518a2c431503761fd4f5688f96a68a7 (patch)
tree440fdbd0bd4b62a0a33f91cdb2bcf58a15997f64
parentf0ced7e2810202be258eb58ae0a412b2091f7e5f (diff)
Use a variable for the qmake executable
Use $(QMAKE) (defaulting to "qmake", like before) to refer to the qmake executable. This allows to use in tests a qmake not in $PATH (e.g. in a local installation), without altering the environment: $ make check QMAKE=/path/to/qmake Change-Id: I4ed906a5b911b6aed82596219ca813c643db6d62 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d32e6b8..2e7f814 100644
--- a/Makefile
+++ b/Makefile
@@ -45,6 +45,7 @@ TOOLS = assistant \
# keep the above line empty
MACTOOLS = macdeployqt
+QMAKE = qmake
all:
cd src/qtchooser && $(MAKE)
@@ -74,7 +75,7 @@ uninstall:
;; esac
tests/auto/Makefile: tests/auto/auto.pro
- cd tests/auto && qmake -o Makefile auto.pro
+ cd tests/auto && $(QMAKE) -o Makefile auto.pro
check: tests/auto/Makefile
cd src/qtchooser && $(MAKE) check