From 745cb4b7ecac7efaab2096de700664b67752ff63 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Mon, 3 Sep 2012 18:24:02 +0200 Subject: Introduce $$QTC_PREFIX 'make install' now installs to $(INSTALL_ROOT)$$QTC_PREFIX/... This is used for giving the contents of the 7zips an additional prefix. (previously done by doing an additional copying step in bindistHelper). QTC_PREFIX can also be used to give Qt Creator a different install path at qmake time, and defaults to /usr/local on Linux. On Windows and Mac there is no default for QTC_PREFIX. Usage: qmake -r QTC_PREFIX=/qtcreator-2.6.0 && make && INSTALL_ROOT=/tmp/creator-dist make install Change-Id: Id30781e14bfdde52531800f22b22e39f0459e806 Reviewed-by: Oswald Buddenhagen --- bin/bin.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/bin.pro b/bin/bin.pro index 523cc50bd1..d546b053cb 100644 --- a/bin/bin.pro +++ b/bin/bin.pro @@ -9,7 +9,7 @@ QMAKE_STRIP = QMAKE_CLEAN = qtcreator.sh -target.path = /bin +target.path = $$QTC_PREFIX/bin INSTALLS += target OTHER_FILES = $$PWD/qtcreator.sh -- cgit v1.2.3