diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-11-14 12:02:06 +0100 |
|---|---|---|
| committer | Daniel Molkentin <daniel.molkentin@nokia.com> | 2011-11-14 15:13:16 +0100 |
| commit | e61381fabafdfdf3cea025cb6768aa4f1c327cc0 (patch) | |
| tree | 72e865cb5f5c5b78291c5f5b1ffb6604a6cd08a9 | |
| parent | f7a3fde12703f03bff72c20c59b82cb144b1f927 (diff) | |
| download | qt-creator-e61381fabafdfdf3cea025cb6768aa4f1c327cc0.tar.gz | |
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>
| -rw-r--r-- | doc/doc.pri | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index 3bcdc6c645..a62b701f8b 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -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 |