forked from qt-creator/qt-creator
turn doc installation into an explicit target
otherwise a "make install" without a prior "make docs" will fail. we cannot make install depend on docs, because the docs target does not (and cannot reasonably) have proper dependency tracking, so it would be rebuilt on every install attempt. we could make install depend on the presence of the docs files without checking their timestamps, but that would be dirty. Task-number: QTCREATORBUG-6245 Change-Id: I35a9b8110f8f12760a338b5b100d69e226d3c2e8 Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
This commit is contained in:
committed by
Daniel Molkentin
parent
f7a3fde127
commit
e61381faba
+5
-2
@@ -65,13 +65,16 @@ dev_qch_docs.depends += dev_html_docs
|
||||
unix:!macx {
|
||||
inst_qch_docs.files = $$QCH_FILE
|
||||
inst_qch_docs.path = /share/doc/qtcreator
|
||||
inst_qch_docs.CONFIG += no_check_exist
|
||||
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.CONFIG += no_check_exist
|
||||
inst_dev_qch_docs.CONFIG += no_check_exist no_default_install
|
||||
INSTALLS += inst_dev_qch_docs
|
||||
|
||||
install_docs.depends = install_inst_qch_docs install_inst_dev_qch_docs
|
||||
QMAKE_EXTRA_TARGETS += install_docs
|
||||
}
|
||||
|
||||
docs_online.depends = html_docs_online dev_html_docs_online
|
||||
|
||||
Reference in New Issue
Block a user