From: Matthias Maier Date: Tue, 10 Feb 2015 16:55:13 +0000 (+0100) Subject: CMake: Reintroduce old installation behavior X-Git-Tag: v8.3.0-rc1~486^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F510%2Fhead;p=dealii.git CMake: Reintroduce old installation behavior --- diff --git a/cmake/setup_deal_ii.cmake b/cmake/setup_deal_ii.cmake index 0ddabe5a51..eb0c101b46 100644 --- a/cmake/setup_deal_ii.cmake +++ b/cmake/setup_deal_ii.cmake @@ -117,7 +117,7 @@ SET_IF_EMPTY(DEAL_II_DEBUG_SUFFIX ".g") SET_IF_EMPTY(DEAL_II_RELEASE_SUFFIX "") # -# Try to obey the FSHS... +# Try to obey the FSHS as close as possible ... # SET_IF_EMPTY(DEAL_II_EXECUTABLE_RELDIR "bin") SET_IF_EMPTY(DEAL_II_INCLUDE_RELDIR "include") @@ -125,9 +125,12 @@ SET_IF_EMPTY(DEAL_II_LIBRARY_RELDIR "lib${LIB_SUFFIX}") SET_IF_EMPTY(DEAL_II_PROJECT_CONFIG_RELDIR "${DEAL_II_LIBRARY_RELDIR}/cmake/${DEAL_II_PROJECT_CONFIG_NAME}") SET_IF_EMPTY(DEAL_II_SHARE_RELDIR "share/${DEAL_II_PACKAGE_NAME}") SET_IF_EMPTY(DEAL_II_CMAKE_MACROS_RELDIR "${DEAL_II_SHARE_RELDIR}/cmake/macros") -SET_IF_EMPTY(DEAL_II_DOCREADME_RELDIR "share/doc/${DEAL_II_PACKAGE_NAME}") -SET_IF_EMPTY(DEAL_II_DOCHTML_RELDIR "${DEAL_II_DOCREADME_RELDIR}/html") -SET_IF_EMPTY(DEAL_II_EXAMPLES_RELDIR "${DEAL_II_DOCREADME_RELDIR}/examples") +# +# ... but install the documentation into prominent places: +# +SET_IF_EMPTY(DEAL_II_DOCREADME_RELDIR "./") +SET_IF_EMPTY(DEAL_II_DOCHTML_RELDIR "doc") +SET_IF_EMPTY(DEAL_II_EXAMPLES_RELDIR "examples") IF(CMAKE_BUILD_TYPE MATCHES "Debug") LIST(APPEND DEAL_II_BUILD_TYPES "DEBUG")