Permalink
Browse files

respect LIB_INSTALL_DIR

1 parent 2fab2d3 commit 89f9a6bdf113857b70653304de0599f31f8bb5e3 @marguerite marguerite committed Jan 7, 2016
Showing with 6 additions and 3 deletions.
  1. +4 −1 cmake/ConkyBuildOptions.cmake
  2. +2 −2 lua/CMakeLists.txt
@@ -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")
View
@@ -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
)

0 comments on commit 89f9a6b

Please sign in to comment.