From 89f9a6bdf113857b70653304de0599f31f8bb5e3 Mon Sep 17 00:00:00 2001 From: marguerite Date: Thu, 7 Jan 2016 14:42:14 +0800 Subject: [PATCH 1/2] respect LIB_INSTALL_DIR --- cmake/ConkyBuildOptions.cmake | 5 ++++- lua/CMakeLists.txt | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake/ConkyBuildOptions.cmake b/cmake/ConkyBuildOptions.cmake index e4bf6418..97610d96 100644 --- a/cmake/ConkyBuildOptions.cmake +++ b/cmake/ConkyBuildOptions.cmake @@ -56,7 +56,10 @@ endif(BUILD_I18N) # Some standard options set(SYSTEM_CONFIG_FILE "/etc/conky/conky.conf" CACHE STRING "Default system-wide Conky configuration file") # use FORCE below to make sure this changes when CMAKE_INSTALL_PREFIX is modified -set(PACKAGE_LIBRARY_DIR "${CMAKE_INSTALL_PREFIX}/lib/conky" CACHE STRING "Package library path (where Lua bindings are installed" FORCE) +if (NOT LIB_INSTALL_DIR) + set (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib") +endif (NOT LIB_INSTALL_DIR) +set(PACKAGE_LIBRARY_DIR "${LIB_INSTALL_DIR}/conky" CACHE STRING "Package library path (where Lua bindings are installed" FORCE) set(DEFAULTNETDEV "eth0" CACHE STRING "Default networkdevice") set(XDG_CONFIG_FILE "$HOME/.config/conky/conky.conf" CACHE STRING "Configfile of the user (XDG)") set(CONFIG_FILE "$HOME/.conkyrc" CACHE STRING "Configfile of the user") diff --git a/lua/CMakeLists.txt b/lua/CMakeLists.txt index 8f53f8a7..436dd0c5 100644 --- a/lua/CMakeLists.txt +++ b/lua/CMakeLists.txt @@ -76,6 +76,6 @@ endif(BUILD_LUA_CAIRO AND BUILD_LUA_IMLIB2) install(TARGETS ${lua_libs} - LIBRARY DESTINATION lib${LIB_SUFFIX}/conky - ARCHIVE DESTINATION lib${LIB_SUFFIX}/conky + LIBRARY DESTINATION ${LIB_INSTALL_DIR}/conky + ARCHIVE DESTINATION ${LIB_INSTALL_DIR}/conky ) From 7dff2e5577b66c4464a5949dade409c064be493e Mon Sep 17 00:00:00 2001 From: marguerite Date: Thu, 7 Jan 2016 17:26:18 +0800 Subject: [PATCH 2/2] do not override LIB_SUFFIX --- cmake/ConkyBuildOptions.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/ConkyBuildOptions.cmake b/cmake/ConkyBuildOptions.cmake index 97610d96..fad12fb4 100644 --- a/cmake/ConkyBuildOptions.cmake +++ b/cmake/ConkyBuildOptions.cmake @@ -57,7 +57,7 @@ endif(BUILD_I18N) set(SYSTEM_CONFIG_FILE "/etc/conky/conky.conf" CACHE STRING "Default system-wide Conky configuration file") # use FORCE below to make sure this changes when CMAKE_INSTALL_PREFIX is modified if (NOT LIB_INSTALL_DIR) - set (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib") + set (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") endif (NOT LIB_INSTALL_DIR) set(PACKAGE_LIBRARY_DIR "${LIB_INSTALL_DIR}/conky" CACHE STRING "Package library path (where Lua bindings are installed" FORCE) set(DEFAULTNETDEV "eth0" CACHE STRING "Default networkdevice")