[PATCH] Fix build with changed documentation paths

[Wald Commits]

# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1411384290 -7200
# Node ID 69f7d302cdb9ab3af181a748ee66257d2d384536
# Parent  cf1fdb254c411372feba94cd77705448f767fb6e
Fix build with changed documentation paths

diff -r cf1fdb254c41 -r 69f7d302cdb9 CMakeLists.txt
--- a/CMakeLists.txt	Mon Sep 22 13:02:11 2014 +0200
+++ b/CMakeLists.txt	Mon Sep 22 13:11:30 2014 +0200
@@ -144,15 +144,15 @@
 endif()
 
 # Documentation
-configure_file (doc/Doxyfile.in doc/Doxyfile)
-add_subdirectory(doc)
+configure_file (doc/apidoc/Doxyfile.in doc/apidoc/Doxyfile)
+add_subdirectory(doc/apidoc)
 
 find_package(Sphinx)
 
 if (NOT SPHINX_FOUND)
    message (STATUS "WARNING could not find sphinx (Package python-sphinx). Manuals will not be built.")
 else()
-   add_subdirectory(manuals)
+   add_subdirectory(doc/help)
 endif()
 
 add_subdirectory(packaging)
diff -r cf1fdb254c41 -r 69f7d302cdb9 doc/apidoc/Doxyfile.in
--- a/doc/apidoc/Doxyfile.in	Mon Sep 22 13:02:11 2014 +0200
+++ b/doc/apidoc/Doxyfile.in	Mon Sep 22 13:11:30 2014 +0200
@@ -52,7 +52,7 @@
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = @CMAKE_BINARY_DIR@/doc/generated
+OUTPUT_DIRECTORY       = @CMAKE_BINARY_DIR@/doc/apidoc/generated
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output
diff -r cf1fdb254c41 -r 69f7d302cdb9 doc/help/CMakeLists.txt
--- a/doc/help/CMakeLists.txt	Mon Sep 22 13:02:11 2014 +0200
+++ b/doc/help/CMakeLists.txt	Mon Sep 22 13:11:30 2014 +0200
@@ -13,19 +13,19 @@
    set(SPHINX_THEME_DIR "${CMAKE_CURRENT_SOURCE_DIR}/theme")
 endif()
 
-set(ADMIN_MANUAL_IN "${CMAKE_CURRENT_SOURCE_DIR}/admin-manual")
-set(ADMIN_MANUAL_OUT "${CMAKE_CURRENT_BINARY_DIR}/admin-manual")
-set(HELP_MANUAL_IN "${CMAKE_CURRENT_SOURCE_DIR}/help-manual")
-set(HELP_MANUAL_OUT "${CMAKE_CURRENT_BINARY_DIR}/help-manual")
+set(ADMIN_MANUAL_IN "${CMAKE_CURRENT_SOURCE_DIR}/admin")
+set(ADMIN_MANUAL_OUT "${CMAKE_CURRENT_BINARY_DIR}/admin")
+set(HELP_MANUAL_IN "${CMAKE_CURRENT_SOURCE_DIR}/client")
+set(HELP_MANUAL_OUT "${CMAKE_CURRENT_BINARY_DIR}/client")
 
 
 # configured documentation tools and intermediate build results
 set(BINARY_BUILD_DIR_ADMIN "${CMAKE_CURRENT_BINARY_DIR}/_build-admin")
-set(BINARY_BUILD_DIR_HELP "${CMAKE_CURRENT_BINARY_DIR}/_build-help")
+set(BINARY_BUILD_DIR_HELP "${CMAKE_CURRENT_BINARY_DIR}/_build-client")
 
 # Sphinx cache with pickled ReST documents
 set(SPHINX_CACHE_DIR_ADMIN "${CMAKE_CURRENT_BINARY_DIR}/_doctrees-admin")
-set(SPHINX_CACHE_DIR_HELP "${CMAKE_CURRENT_BINARY_DIR}/_doctrees-help")
+set(SPHINX_CACHE_DIR_HELP "${CMAKE_CURRENT_BINARY_DIR}/_doctrees-client")
 
 # HTML output directory
 set(SPHINX_HTML_DIR_ADMIN "${ADMIN_MANUAL_OUT}/html")