From 9dd695b17adfd47a35ea49b9c19cf5984d2d68be Mon Sep 17 00:00:00 2001
From: Kornel Benko <kornel@lyx.org>
Date: Tue, 7 Jun 2016 14:38:20 +0200
Subject: [PATCH] Cmake build: Correct some installation paths

---
 CMakeLists.txt                                  | 6 ++++--
 development/cmake/modules/LyXDestinations.cmake | 9 +++++++--
 src/CMakeLists.txt                              | 2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8425716b8e..6cdd52c52f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -497,9 +497,11 @@ 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/man1" 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.")
 	else()
-		set(LYX_MAN_DIR "${CMAKE_INSTALL_PREFIX}/man/man1" 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/modules/LyXDestinations.cmake b/development/cmake/modules/LyXDestinations.cmake
index 4db61950d9..6bb17c41f1 100644
--- a/development/cmake/modules/LyXDestinations.cmake
+++ b/development/cmake/modules/LyXDestinations.cmake
@@ -31,9 +31,11 @@
 function(get_locale_destination _result)
   set(_dir)
   if(WIN32)
-    set(_dir "Resources/locale")
+    # "Resources/locale"
+    set(_dir "${LYX_DATA_SUBDIR}locale")
   elseif(APPLE)
-    set(_dir "locale")
+    # "Contents/Resources/locale"
+    set(_dir "${LYX_DATA_SUBDIR}locale")
   elseif(UNIX)
     set(_dir "share/locale")
   else()
@@ -47,6 +49,7 @@ function(get_data_destination _result)
   if(WIN32)
     set(_dir "${LYX_DATA_SUBDIR}")
   elseif(APPLE)
+    # "Contents/Resources/"
     set(_dir "${LYX_DATA_SUBDIR}")
   elseif(UNIX)
     set(_dir "${LYX_DATA_SUBDIR}")
@@ -61,6 +64,7 @@ function(get_font_destination _result)
   if(WIN32)
     set(_dir "${LYX_DATA_SUBDIR}fonts/")
   elseif(APPLE)
+    # "Contents/Resources/fonts/"
     set(_dir "${LYX_DATA_SUBDIR}fonts/")
   elseif(UNIX)
     set(_dir "fonts/truetype/${_lyx}/")
@@ -75,6 +79,7 @@ function(get_tex_destination _result)
   if(WIN32)
     set(_dir "${LYX_DATA_SUBDIR}tex/")
   elseif(APPLE)
+    # "Contents/Resources/tex/" 
     set(_dir "${LYX_DATA_SUBDIR}tex/")
   elseif(UNIX)
     set(_dir "texmf/tex/latex/${_lyx}/")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eb350c1774..0a131c99ed 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -157,7 +157,7 @@ project_source_group("${GROUP_CODE}" lyx_sources lyx_headers)
 
 install(TARGETS ${_lyx} 
     BUNDLE DESTINATION . COMPONENT Runtime
-    RUNTIME DESTINATION bin COMPONENT Runtime)
+    RUNTIME DESTINATION ${LYX_UTILITIES_INSTALL_PATH} COMPONENT Runtime)
 
 if(LYX_BUNDLE)
 	if(APPLE)