From kde-commits  Sun Feb 06 02:19:44 2011
From: Jeremy Paul Whiting <jpwhiting () kde ! org>
Date: Sun, 06 Feb 2011 02:19:44 +0000
To: kde-commits
Subject: KDE/kdeedu
Message-Id: <20110206021944.8FA46AC8CA () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=129695881801872

SVN commit 1219072 by whiting:

move marble documentation from doc/marble to marble/doc

 M  +0 -1      CMakeLists.txt  
 D             doc/CMakeLists.txt  
 D             doc/marble (directory)  
 M  +1 -0      marble/CMakeLists.txt  
 A             marble/doc (directory)  
 M  +1 -1      marble/doc/CMakeLists.txt  


--- trunk/KDE/kdeedu/CMakeLists.txt #1219071:1219072
@@ -100,5 +100,4 @@
 if (EIGEN2_FOUND AND NOT WIN32)
   macro_optional_add_subdirectory(step)
 endif (EIGEN2_FOUND AND NOT WIN32)
-macro_optional_add_subdirectory(doc)
 macro_display_feature_log()
--- trunk/KDE/kdeedu/marble/CMakeLists.txt #1219071:1219072
@@ -293,6 +293,7 @@
 )
 ####################################################
 # Descend into subdirectories
+add_subdirectory(doc)
 add_subdirectory(src)
 add_subdirectory(data)
 
--- trunk/KDE/kdeedu/marble/doc/CMakeLists.txt #1219059:1219072
@@ -1,4 +1,4 @@
 ########### 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 marble)