From kde-commits  Sun Feb 06 01:31:06 2011
From: Jeremy Paul Whiting <jpwhiting () kde ! org>
Date: Sun, 06 Feb 2011 01:31:06 +0000
To: kde-commits
Subject: KDE/kdeedu
Message-Id: <20110206013106.AA78CAC8CA () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=129695590832699

SVN commit 1219060 by whiting:

move Kalzium documentation from doc/kalzium to kalzium/doc

 M  +0 -4      doc/CMakeLists.txt  
 D             doc/kalzium (directory)  
 M  +2 -1      kalzium/CMakeLists.txt  
 A             kalzium/doc (directory)  
 M  +1 -1      kalzium/doc/CMakeLists.txt  


--- trunk/KDE/kdeedu/doc/CMakeLists.txt #1219059:1219060
@@ -1,7 +1,3 @@
-if(BUILD_kalzium)
-  macro_optional_add_subdirectory(kalzium)
-endif()
-
 if(BUILD_kgeography)
   macro_optional_add_subdirectory(kgeography)
 endif()
--- trunk/KDE/kdeedu/kalzium/CMakeLists.txt #1219059:1219060
@@ -41,7 +41,8 @@
   message(STATUS "Kalzium molecular editor disabled")
 endif (OPENBABEL2_FOUND AND Avogadro_FOUND AND EIGEN2_FOUND)
 
+add_subdirectory(doc)
 add_subdirectory(src)
 add_subdirectory(data)
 add_subdirectory(plasmoid)
-add_subdirectory(libscience)
\ No newline at end of file
+add_subdirectory(libscience)
--- trunk/KDE/kdeedu/kalzium/doc/CMakeLists.txt #1219059:1219060
@@ -1,5 +1,5 @@
 ########### 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 kalzium)
 kde4_create_manpage(man-kalzium.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})