diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-17 15:08:39 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-18 21:01:26 +0200 |
| commit | e6cbf2f9858f88f2148e80e528f5aaddc91373a1 (patch) | |
| tree | c1559efff00c7609e4f614994f9866ef65768af2 /mkspecs | |
| parent | b9facbf34595464f677e12ef5100328d4c318380 (diff) | |
Prevent 'make install' from automatically installing documentation
Just like 'make docs' is used to build documentation, you will now have
to run 'make install_docs' to install it.
Change-Id: I57db53160ca91618784f4e39da0a47322c070208
Task-number: QTBUG-27590
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/default_post.prf | 8 | ||||
| -rw-r--r-- | mkspecs/features/qt_installs.prf | 6 |
2 files changed, 13 insertions, 1 deletions
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf index 003a73dedf..a77738222f 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -73,3 +73,11 @@ QMAKE_LIBDIR += $$QMAKE_LIBDIR_POST } QMAKE_EXTRA_TARGETS += docs } + +!contains(QMAKE_EXTRA_TARGETS, install_docs) { + contains(TEMPLATE, subdirs) { + prepareRecursiveTarget(install_docs) + prepareRecursiveTarget(uninstall_docs) + } + QMAKE_EXTRA_TARGETS += install_docs uninstall_docs +} diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf index 507d3ebddc..11005b02ac 100644 --- a/mkspecs/features/qt_installs.prf +++ b/mkspecs/features/qt_installs.prf @@ -51,7 +51,11 @@ qt_install_module { qt_install_module_docs { module_docs.files = $$QMAKE_DOCS_OUTPUTDIR module_docs.path = $$[QT_INSTALL_DOCS] - module_docs.CONFIG += no_check_exist directory + module_docs.CONFIG += no_check_exist directory no_default_install module_docs.depends += docs INSTALLS += module_docs + + install_docs.depends = install_module_docs + uninstall_docs.depends = uninstall_module_docs + QMAKE_EXTRA_TARGETS += install_docs uninstall_docs } |