summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDaniel Molkentin <daniel.molkentin@nokia.com>2012-09-03 18:24:02 +0200
committerEike Ziller <eike.ziller@digia.com>2012-09-25 10:14:51 +0200
commit745cb4b7ecac7efaab2096de700664b67752ff63 (patch)
tree2378134d18512375279c36e6b6af3e6be9beddf1 /doc
parent4e4580d4c267dbb995ede106caa3347d556ad88c (diff)
downloadqt-creator-745cb4b7ecac7efaab2096de700664b67752ff63.tar.gz
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 <oswald.buddenhagen@digia.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/doc.pri4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/doc.pri b/doc/doc.pri
index 285951f22c..c163bce40c 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -78,12 +78,12 @@ dev_qch_docs.depends += dev_html_docs
!macx {
inst_qch_docs.files = $$QCH_FILE
- inst_qch_docs.path = /share/doc/qtcreator
+ inst_qch_docs.path = $$QTC_PREFIX/share/doc/qtcreator
inst_qch_docs.CONFIG += no_check_exist no_default_install
INSTALLS += inst_qch_docs
inst_dev_qch_docs.files = $$DEV_QCH_FILE
- inst_dev_qch_docs.path = /share/doc/qtcreator
+ inst_dev_qch_docs.path = $$QTC_PREFIX/share/doc/qtcreator
inst_dev_qch_docs.CONFIG += no_check_exist no_default_install
INSTALLS += inst_dev_qch_docs