Fix plugin installation path to /usr/lib

/usr/lib/libupdate-control-plugin.so is fixed in src/update_control.c, so
this is where plugin must be installed, regardless of actual architecture's
libdir (/usr/lib vs /usr/lib64).

Change-Id: I1d964ef93711f6e7444c66fad374f5f4f9da13cc

diff --git a/packaging/update-control.spec b/packaging/update-control.spec
index eaf29658c173534b5f506b61f30f73b3703b7880..d103c7c3296a39a0cc8ab2ec3d31984760b4b02b 100644 (file)
--- a/packaging/update-control.spec
+++ b/packaging/update-control.spec
@@ -107,4 +107,5 @@ ln -s ../%{service_file} %{buildroot}/%{_unitdir}/multi-user.target.wants/%{serv
 %files plugin
 %manifest %{name}.manifest
 %license LICENSE
-%{_libdir}/libupdate-control-plugin.so*
+# path is fixed in src/update_control.c
+/usr/lib/libupdate-control-plugin.so*

diff --git a/src/plugin/CMakeLists.txt b/src/plugin/CMakeLists.txt
index adcf42a16423de551874fae64a8ebdd59d504ea5..5167faad2eac0822c3b972eae95ba150c530a3f0 100644 (file)
--- a/src/plugin/CMakeLists.txt
+++ b/src/plugin/CMakeLists.txt
@@ -48,4 +48,4 @@ SET_TARGET_PROPERTIES(${fw_name}
      CLEAN_DIRECT_OUTPUT 1
 )
 
-INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS ${fw_name} DESTINATION /usr/lib)

diff --git a/update-manager/CMakeLists.txt b/update-manager/CMakeLists.txt
index 41108c1201baa0b45e8ec6af7570fa778195cf84..064b2c4b236964dc24b278d4aff1bf6d5fdcdb7f 100644 (file)
--- a/update-manager/CMakeLists.txt
+++ b/update-manager/CMakeLists.txt
@@ -39,4 +39,4 @@ FILE(GLOB SOURCE_FILES
 )
 ADD_EXECUTABLE(${PKG_NAME} ${SOURCE_FILES})
 TARGET_LINK_LIBRARIES(${PKG_NAME} ${${PKG_NAME}_LDFLAGS} "-ldl")
-INSTALL(TARGETS ${PKG_NAME} DESTINATION bin)
\ No newline at end of file
+INSTALL(TARGETS ${PKG_NAME} DESTINATION bin)