From: Kibak Yoon <kibak.yoon@samsung.com>
Date: Mon, 5 Jan 2015 15:56:18 +0000 (+0900)
Subject: sensord: use LIBDIR macro for finding library path
X-Git-Tag: submit/tizen/20150113.012540~30
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F00%2F33100%2F1;p=platform%2Fcore%2Fsystem%2Fsensord.git

sensord: use LIBDIR macro for finding library path

Signed-off-by: Kibak Yoon <kibak.yoon@samsung.com>
Change-Id: Ia9ae92b3213f5ea9b0121c39e9137f9fe1b9274e
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5381991..5228178 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,7 @@ set(PROJECT_RELEASE_VERSION "1")
 set(CMAKE_VERBOSE_MAKEFILE OFF)
 add_definitions(-Wall -O3 -omit-frame-pointer)
 add_definitions(-DUSE_DLOG_LOG)
+add_definitions(-DLIBDIR="${LIBDIR}")
 #add_definitions(-Wall -g -D_DEBUG)
 
 FIND_PROGRAM(UNAME NAMES uname)
diff --git a/src/shared/sensor_plugin_loader.cpp b/src/shared/sensor_plugin_loader.cpp
index 5a096a9..d26a773 100755
--- a/src/shared/sensor_plugin_loader.cpp
+++ b/src/shared/sensor_plugin_loader.cpp
@@ -39,7 +39,7 @@ using std::unordered_set;
 #define SENSOR_ELEMENT "SENSOR"
 
 #define PLUGINS_CONFIG_PATH "/usr/etc/sensor_plugins.xml"
-#define PLUGINS_DIR_PATH "/usr/lib/sensord"
+#define PLUGINS_DIR_PATH "/sensord"
 
 #define SENSOR_INDEX_SHIFT 16
 
@@ -146,7 +146,7 @@ bool sensor_plugin_loader::load_plugins(void)
 	vector<string> unique_hal_paths, unique_sensor_paths;
 
 	get_paths_from_config(string(PLUGINS_CONFIG_PATH), hal_paths, sensor_paths);
-	get_paths_from_dir(string(PLUGINS_DIR_PATH), hal_paths, sensor_paths);
+	get_paths_from_dir(string(LIBDIR) + string(PLUGINS_DIR_PATH), hal_paths, sensor_paths);
 
 	//remove duplicates while keeping the original ordering => unique_*_paths
 	unordered_set<string> s;