From fd00c9c107d3f33f8917cefe59c0f47072f46a5f Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Tue, 23 Feb 2021 15:28:51 +0900 Subject: [PATCH] Fix plugin lib path - Uses LIB_INSTALL_DIR instead of hardcoded path Change-Id: Ib65fe31ddcec4021e4eec87e6ae5a7fa152593f7 Signed-off-by: Hwankyu Jhun --- server/CMakeLists.txt | 2 ++ server/alarm-manager.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index db90b53..e07675a 100755 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -4,6 +4,8 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server) AUX_SOURCE_DIRECTORY(./ SRCS) +ADD_DEFINITIONS("-DPLUGIN_LIB_DIR=\"${LIB_INSTALL_DIR}\"") + PKG_CHECK_MODULES(svr_pkgs REQUIRED glib-2.0 dlog aul bundle appsvc pkgmgr-info pkgmgr vconf gio-2.0 gio-unix-2.0 capi-system-device libtzplatform-config libsystemd eventsystem notification sqlite3 cert-svc-vcore diff --git a/server/alarm-manager.c b/server/alarm-manager.c index 7bfdf2a..4bb3a3e 100644 --- a/server/alarm-manager.c +++ b/server/alarm-manager.c @@ -59,7 +59,7 @@ #define RTC_WKALM_BOOT_SET _IOW('p', 0x80, struct rtc_wkalrm) #endif -#define PATH_LIB_ALARMMGR_PLUGIN "/usr/lib/libalarm-server-plugin.so" +#define PATH_LIB_ALARMMGR_PLUGIN PLUGIN_LIB_DIR"/libalarm-server-plugin.so" static void *plugin_handle; static int (*RTC_INIT)(void); -- 2.7.4