fix and reenable the documentation installation

use the SUBDIR parameters for kde4_create_handbook, so it installs in the proper place remove the comment related to the issue, and enable the doc subdir
15 years ago · 91df1b1fc9
parent 5746337d55
commit 91df1b1fc9
2 changed files with 2 additions and 7 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -6,10 +6,7 @@ find_package(KDE4 REQUIRED) # Needed for the docs
 include(KDE4Defaults)
 include(MacroLibrary)

-# CMake installs to $KDEDIR/share/doc/HTML/$lang/doc for some reason instead
-# of                $KDEDIR/share/doc/HTML/$lang/kdesrc-build.
-# Figure it out later I guess...
-#macro_optional_add_subdirectory(doc)
+macro_optional_add_subdirectory(doc)

 # Null install target so CMake succeeds
 #add_custom_target(install
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@ -1,4 +1,2 @@
-project(kdesrc-build) # Yes, just redo it, it's makes everything install right
-
 ########### install files ###############
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kdesrc-build)