Cmake build: All directory variables should contain trailing '/'

diff --git a/3rdparty/dtl/CMakeLists.txt b/3rdparty/dtl/CMakeLists.txt
index 58354958e9edf1cc77db484c16b70aab217c0768..999b8a20ba9fc01c1bc83f85f32a38346ecc398b 100644 (file)
--- a/3rdparty/dtl/CMakeLists.txt
+++ b/3rdparty/dtl/CMakeLists.txt
@@ -35,5 +35,5 @@ endforeach()
 # Install dtl tools in this directory to omit possible packaging conflicts
 # if installing multiple lyx versions, each with own dtl executables
 get_data_destination(dest_data)
-install(TARGETS ${targets} DESTINATION "${dest_data}/extratools")
-install(FILES ${_manuals} DESTINATION ${LYX_MAN_DIR}/man1)
+install(TARGETS ${targets} DESTINATION "${dest_data}extratools/")
+install(FILES ${_manuals} DESTINATION "${dest_data}extraman/man1/")

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf1c930cc789886734155acb8fa0f423bdd83388..c1d90f7de17f89b858d5fe9ed69910e9201aa54e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -580,15 +580,16 @@ get_locale_destination(LYX_LOCALEDIR)
 set(LYX_ABS_INSTALLED_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/${LYX_LOCALEDIR}")
 set(LYX_ABS_TOP_SRCDIR "${TOP_SRC_DIR}")
 
+unset(LYX_MAN_DIR CACHE)
 if(LYX_BUNDLE AND APPLE)
        set(LYX_MAN_DIR "${LYX_DATA_SUBDIR}" CACHE STRING "Install location for man pages.")
 else()
        if(WIN32)
-               set(LYX_MAN_DIR "${CMAKE_BINARY_DIR}/usr/local/man" CACHE STRING "Install location for man pages.")
+               set(LYX_MAN_DIR "${CMAKE_BINARY_DIR}/usr/local/man/" CACHE STRING "Install location for man pages.")
        elseif(UNIX)
-               set(LYX_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE STRING "Install location for man pages.")
+               set(LYX_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man/" CACHE STRING "Install location for man pages.")
        else()
-               set(LYX_MAN_DIR "${CMAKE_INSTALL_PREFIX}/man" CACHE STRING "Install location for man pages.")
+               set(LYX_MAN_DIR "${CMAKE_INSTALL_PREFIX}/man/" CACHE STRING "Install location for man pages.")
        endif()
 endif()
 mark_as_advanced(LYX_MAN_DIR)

diff --git a/development/cmake/man/CMakeLists.txt b/development/cmake/man/CMakeLists.txt
index 6b795c93f68fc30cf49986dd94191f8eacd707ea..f7168528b74e48bc56904ec772206c7eafdcc656 100755 (executable)
--- a/development/cmake/man/CMakeLists.txt
+++ b/development/cmake/man/CMakeLists.txt
@@ -28,7 +28,7 @@ endforeach(_mn)
 ADD_CUSTOM_TARGET(man ALL DEPENDS ${_manuals})
 set_target_properties(man PROPERTIES FOLDER "doc")
 
-install(FILES ${_manuals} DESTINATION ${LYX_MAN_DIR}/man1)
+install(FILES ${_manuals} DESTINATION "${LYX_MAN_DIR}man1")
 
 # ADD_MANUALS("lyx")