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>

diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
index 003a73d..a777382 100644 (file)
--- 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 507d3eb..11005b0 100644 (file)
--- 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
 }