[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdesrc-build] /
From:       Pino Toscano <pino () kde ! org>
Date:       2011-01-23 9:35:34
Message-ID: 20110123093534.06FA7A6092 () git ! kde ! org
[Download RAW message or body]

Git commit 91df1b1fc968cb6b6abeb2f64cbfd1be78d0b74c by Pino Toscano
Pushed by pino into branch master

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

M  +1    -4    CMakeLists.txt     
M  +1    -3    doc/CMakeLists.txt     

http://commits.kde.org/a5d5b61a/91df1b1fc968cb6b6abeb2f64cbfd1be78d0b74c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf8cb51..cb7efa7 100644
--- 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
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index b5ee994..5faf6c4 100644
--- 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)

[prev in list] [next in list] [prev in thread] [next in thread]