Overview

File albert-fix-libdir.patch of Package albert

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,6 +31,10 @@ endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
+if(NOT DEFINED LIB_INSTALL_DIR)
+    set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
+endif()
+
 # Build project
 add_subdirectory(src/application/)
 add_subdirectory(src/lib/)
--- a/src/application/CMakeLists.txt
+++ b/src/application/CMakeLists.txt
@@ -9,7 +9,7 @@ add_executable(${PROJECT_NAME} main.cpp)
 target_link_libraries(${PROJECT_NAME} albertcore)
 
 # Set the RPATH for the library lookup
-set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/albert")
+set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${LIB_INSTALL_DIR}/albert")
 
 # Install target
 install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
--- a/src/lib/albert/CMakeLists.txt
+++ b/src/lib/albert/CMakeLists.txt
@@ -52,7 +52,7 @@ target_link_libraries(${PROJECT_NAME}
 )
 
 # Set the RPATH for the library lookup
-set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/albert")
+set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${LIB_INSTALL_DIR}/albert")
 
 # Install target
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert)
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert")
--- a/src/lib/globalshortcut/CMakeLists.txt
+++ b/src/lib/globalshortcut/CMakeLists.txt
@@ -45,4 +45,4 @@ target_include_directories(${PROJECT_NAM
 target_link_libraries(${PROJECT_NAME} PRIVATE ${LIB})
 
 # Install target
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert)
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert")
--- a/src/lib/xdg/CMakeLists.txt
+++ b/src/lib/xdg/CMakeLists.txt
@@ -33,4 +33,4 @@ target_link_libraries(${PROJECT_NAME}
 )
 
 # Install target
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert)
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert")
--- a/src/plugins/applications/CMakeLists.txt
+++ b/src/plugins/applications/CMakeLists.txt
@@ -32,5 +32,5 @@ target_link_libraries(${PROJECT_NAME}
 )
 
 # Install target
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert/plugins)
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert/plugins")
 
--- a/src/plugins/calculator/CMakeLists.txt
+++ b/src/plugins/calculator/CMakeLists.txt
@@ -29,4 +29,4 @@ target_link_libraries(${PROJECT_NAME}
 )
 
 # Install target
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert/plugins)
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert/plugins")
--- a/src/plugins/chromebookmarks/CMakeLists.txt
+++ b/src/plugins/chromebookmarks/CMakeLists.txt
@@ -32,4 +32,4 @@ target_link_libraries(${PROJECT_NAME}
 )
 
 # Install target
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert/plugins)
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert/plugins")
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -3,7 +3,7 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
 
 # Set the RPATH for the library lookup
-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/albert")
+set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}/albert")
 
 add_subdirectory(applications)
 add_subdirectory(calculator)
--- a/src/plugins/debug/CMakeLists.txt
+++ b/src/plugins/debug/CMakeLists.txt
@@ -29,4 +29,4 @@ target_include_directories(${PROJECT_NAM
 target_link_libraries(${PROJECT_NAME} ${LIB})
 
 # Install target
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert/plugins)
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert/plugins")
--- a/src/plugins/externalextensions/CMakeLists.txt
+++ b/src/plugins/externalextensions/CMakeLists.txt
@@ -26,4 +26,4 @@ target_link_libraries(${PROJECT_NAME}
 )
 
 # Install target
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert/plugins)
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert/plugins")
--- a/src/plugins/files/CMakeLists.txt
+++ b/src/plugins/files/CMakeLists.txt
@@ -33,4 +33,4 @@ target_link_libraries(${PROJECT_NAME}
 )
 
 # Install target
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert/plugins)
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert/plugins")
--- a/src/plugins/firefoxbookmarks/CMakeLists.txt
+++ b/src/plugins/firefoxbookmarks/CMakeLists.txt
@@ -34,4 +34,4 @@ target_link_libraries(${PROJECT_NAME}
 )
 
 # Install target
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert/plugins)
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert/plugins")
--- a/src/plugins/mpris/CMakeLists.txt
+++ b/src/plugins/mpris/CMakeLists.txt
@@ -28,4 +28,4 @@ target_link_libraries(${PROJECT_NAME}
 )
 
 # Install target
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert/plugins)
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert/plugins")
--- a/src/plugins/ssh/CMakeLists.txt
+++ b/src/plugins/ssh/CMakeLists.txt
@@ -30,4 +30,4 @@ target_link_libraries(${PROJECT_NAME}
 )
 
 # Install target
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert/plugins)
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert/plugins")
--- a/src/plugins/system/CMakeLists.txt
+++ b/src/plugins/system/CMakeLists.txt
@@ -30,4 +30,4 @@ target_link_libraries(${PROJECT_NAME}
 )
 
 # Install target
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert/plugins)
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert/plugins")
--- a/src/plugins/templateExtension/CMakeLists.txt
+++ b/src/plugins/templateExtension/CMakeLists.txt
@@ -27,4 +27,4 @@ target_include_directories(${PROJECT_NAM
 target_link_libraries(${PROJECT_NAME} ${LIB})
 
 # Install target
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert/plugins)
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert/plugins")
--- a/src/plugins/terminal/CMakeLists.txt
+++ b/src/plugins/terminal/CMakeLists.txt
@@ -32,4 +32,4 @@ target_link_libraries(${PROJECT_NAME}
 )
 
 # Install target
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert/plugins)
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert/plugins")
--- a/src/plugins/virtualbox/CMakeLists.txt
+++ b/src/plugins/virtualbox/CMakeLists.txt
@@ -28,4 +28,4 @@ target_link_libraries(${PROJECT_NAME}
 )
 
 # Install target
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert/plugins)
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert/plugins")
--- a/src/plugins/websearch/CMakeLists.txt
+++ b/src/plugins/websearch/CMakeLists.txt
@@ -30,4 +30,4 @@ target_link_libraries(${PROJECT_NAME}
 )
 
 # Install target
-install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/albert/plugins)
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}/albert/plugins")
openSUSE Build Service is sponsored by
Places