diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a0284602..2a5e36594 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,8 +28,6 @@ include(DefineOptions.cmake) include(CPackConfig.cmake) include(DefineInstallationPaths) -# install .dlls to bin/ -set(BIN_INSTALL_DIR "bin" CACHE PATH "-") # disallow in-source build include(MacroEnsureOutOfSourceBuild) diff --git a/cmake/Modules/DefineInstallationPaths.cmake b/cmake/Modules/DefineInstallationPaths.cmake index e45977d7c..9a0ff9997 100644 --- a/cmake/Modules/DefineInstallationPaths.cmake +++ b/cmake/Modules/DefineInstallationPaths.cmake @@ -103,5 +103,8 @@ if (WIN32) set(ICON_INSTALL_DIR "." CACHE PATH "-") set(SOUND_INSTALL_DIR "." CACHE PATH "-") set(LOCALE_INSTALL_DIR "lang" CACHE PATH "-") + set(SYSCONF_INSTALL_DIR "." CACHE PATH "-") + set(MAN_INSTALL_DIR "." CACHE PATH "-") + set(SHARE_INSTALL_PREFIX "." CACHE PATH "-") endif (WIN32) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 2a22167e7..6281e4fdd 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -19,16 +19,23 @@ add_custom_target(userguide ${CMAKE_CURRENT_SOURCE_DIR} ) -install( - FILES - csync.1 - DESTINATION - ${MAN_INSTALL_DIR}/man1 -) +if (UNIX) + install( + FILES + csync.1 + DESTINATION + ${MAN_INSTALL_DIR}/man1 + ) + set(DOC_INSTALL_PATH ${SHARE_INSTALL_PREFIX}/doc/csync) +endif(UNIX) + +if (WIN32) + set(DOC_INSTALL_PATH ${SHARE_INSTALL_PREFIX}/doc) +endif (WIN32) install( DIRECTORY userguide DESTINATION - ${SHARE_INSTALL_PREFIX}/doc/csync + ${DOC_INSTALL_PATH} )