Set the path to the plugin according to the architecture

Change-Id: If0449a1ebb2d8de6d83ec5106c48df0200b58ed9

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd517aa73056decca8b43ede20c9ecef43fb8125..934b817dc8051c9369811a57c945ea398ccc94ff 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,6 +18,8 @@ SET(requires
        glib-2.0
 )
 
+ADD_DEFINITIONS("-DPLUGIN_PATH=\"${PLUGIN_PATH}\"")
+
 INCLUDE(FindPkgConfig)
 pkg_check_modules(${fw_name} REQUIRED ${requires})
 FOREACH(flag ${${fw_name}_CFLAGS})
@@ -27,7 +29,7 @@ ENDFOREACH(flag)
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror -fvisibility=hidden")
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}")
 
 FIND_PROGRAM(GDBUS_CODEGEN NAMES gdbus-codegen)
 EXEC_PROGRAM(${GDBUS_CODEGEN} ARGS "\\

diff --git a/packaging/update-control.spec b/packaging/update-control.spec
index d103c7c3296a39a0cc8ab2ec3d31984760b4b02b..8f6f9451ac24eb6575a1a1dcfa22c7727e3f423a 100644 (file)
--- a/packaging/update-control.spec
+++ b/packaging/update-control.spec
@@ -66,7 +66,8 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 
 %cmake . -DMAJORVER=${MAJORVER} \
         -DFULLVER=%{version} \
-        -DDEBUG_MODE=on
+        -DDEBUG_MODE=on \
+        -DPLUGIN_PATH=%{_libdir}
 
 %__make %{?jobs:-j%jobs}
 
@@ -108,4 +109,4 @@ ln -s ../%{service_file} %{buildroot}/%{_unitdir}/multi-user.target.wants/%{serv
 %manifest %{name}.manifest
 %license LICENSE
 # path is fixed in src/update_control.c
-/usr/lib/libupdate-control-plugin.so*
+%{_libdir}/libupdate-control-plugin.so*

diff --git a/src/plugin/CMakeLists.txt b/src/plugin/CMakeLists.txt
index 5167faad2eac0822c3b972eae95ba150c530a3f0..adcf42a16423de551874fae64a8ebdd59d504ea5 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 /usr/lib)
+INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR})

diff --git a/src/update_control.c b/src/update_control.c
index d87f787abd8862b8dc416ac63ad926326ad9cca3..b154f19f3e903c33e0cf12c1127ac984d6dfccaa 100644 (file)
--- a/src/update_control.c
+++ b/src/update_control.c
@@ -22,7 +22,7 @@
 #define API __attribute__ ((visibility("default")))
 #endif
 
-#define UPDATE_CONTROL_PLUGIN "/usr/lib/libupdate-control-plugin.so"
+#define UPDATE_CONTROL_PLUGIN PLUGIN_PATH"/libupdate-control-plugin.so"
 
 static bool initialized = false;
 static void *plugin_handle = NULL;