File conky-libdir.patch of Package conky

Overview Repositories Revisions Requests Users Attributes Meta

File conky-libdir.patch of Package conky (Revision 3f7b6f5ce7a8dd33f7f81e50373c2dc6)

Currently displaying revision 3f7b6f5ce7a8dd33f7f81e50373c2dc6 , Show latest

Index: conky-1.10.1/cmake/ConkyBuildOptions.cmake
===================================================================
--- conky-1.10.1.orig/cmake/ConkyBuildOptions.cmake
+++ conky-1.10.1/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")
Index: conky-1.10.1/lua/CMakeLists.txt
===================================================================
--- conky-1.10.1.orig/lua/CMakeLists.txt
+++ conky-1.10.1/lua/CMakeLists.txt
@@ -76,6 +76,6 @@ endif(BUILD_LUA_CAIRO AND BUILD_LUA_IMLI
 
 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
 )

Places

File conky-libdir.patch of Package conky (Revision 3f7b6f5ce7a8dd33f7f81e50373c2dc6)

Places