Remove the macro for the hard-coded so file path

Change-Id: I2450e87001b3d64858e3f91b64e1ac6491336698
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04316da24cce33bb307f78e9d7651d8979142ecd..303cca7a93fcae2f594c95a0c5b0140e419566a7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,7 @@ INCLUDE_DIRECTORIES(
 ADD_DEFINITIONS(-O2 -Wall -fPIC -fdata-sections -ffunction-sections)
 ADD_DEFINITIONS(-fvisibility=hidden)
 ADD_DEFINITIONS(-DLOG_TAG="CONTEXT")
+ADD_DEFINITIONS(-D_LIBDIR_="${LIBDIR}")
 SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fPIC -Wl,--as-needed -Wl,--gc-section -Wl,--print-gc-section")
 
 # Profiles

diff --git a/include/ProviderList.h b/include/ProviderList.h
index 4da36a859e58be8744d8f9c26575e65b44c71618..6f8dff45cff560f105d7a8d885e8d6009118c237 100644 (file)
--- a/include/ProviderList.h
+++ b/include/ProviderList.h
@@ -22,8 +22,7 @@
 #include <MyPlaceTypes.h>
 #include <SensorRecorderTypes.h>
 
-#define LIB_DIRECTORY  "/usr/lib/context-service/"
-#define LIB_PREFIX             "libctx-prvd-"
+#define LIB_PREFIX             "/context-service/libctx-prvd-"
 #define LIB_EXTENSION  ".so"
 
 /* Json Formats */

diff --git a/packaging/context-provider.spec b/packaging/context-provider.spec
index 4c2ed87690af4e8d1abc373ae0b064fbf27ed00c..2a2a1d61dd6c27b29964e6679ceeef3e6118b421 100644 (file)
--- a/packaging/context-provider.spec
+++ b/packaging/context-provider.spec
@@ -68,7 +68,7 @@ export CXXFLAGS+=" -std=c++0x"
 #export   CFLAGS+=" -Wcast-qual"
 #export CXXFLAGS+=" -Wcast-qual"
 
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DMAJORVER=${MAJORVER} -DFULLVER=%{version} -DPROFILE=%{?BUILD_PROFILE}
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIBDIR=%{_libdir} -DMAJORVER=${MAJORVER} -DFULLVER=%{version} -DPROFILE=%{?BUILD_PROFILE}
 make %{?jobs:-j%jobs}
 
 %install

diff --git a/src/media-stats/MediaContentMonitor.cpp b/src/media-stats/MediaContentMonitor.cpp
index d99da3697170511fa3e3d13e72f70e3f385c0e22..8fe1a069153c35a0b67675adab60ecfffe510a0c 100644 (file)
--- a/src/media-stats/MediaContentMonitor.cpp
+++ b/src/media-stats/MediaContentMonitor.cpp
@@ -23,7 +23,7 @@
 #include "DbHandle.h"
 #include "MediaContentMonitor.h"
 
-#define SO_PATH "/usr/lib/context-service/libctx-prvd-media-stats-util.so"
+#define SO_PATH _LIBDIR_ "context-service/libctx-prvd-media-stats-util.so"
 
 #define PLAYCOUNT_RETENTION_PERIOD 259200      /* 1 month in secs */
 #define ONE_DAY_IN_SEC 86400

diff --git a/src/my-place/facade/UserPlaces.cpp b/src/my-place/facade/UserPlaces.cpp
index 0c593b409e875064fcc8a42938652e45c79c5aa9..a8e25ea9b2300b83ea0fcada3276fca2bb14c1d3 100755 (executable)
--- a/src/my-place/facade/UserPlaces.cpp
+++ b/src/my-place/facade/UserPlaces.cpp
@@ -24,7 +24,7 @@
 #include <DatabaseManager.h>
 #include <string>
 
-#define SO_PATH "/usr/lib/context-service/libctx-prvd-my-place-places-detector.so"
+#define SO_PATH _LIBDIR_ "context-service/libctx-prvd-my-place-places-detector.so"
 
 typedef void (*places_detector_t)();
 

diff --git a/src/my-place/visit-detector/VisitDetector.cpp b/src/my-place/visit-detector/VisitDetector.cpp
index f8af12539921b338009167aa7824b7fe29323f5f..ac050875604d1e356414b6291dfb1136ecc1f06c 100644 (file)
--- a/src/my-place/visit-detector/VisitDetector.cpp
+++ b/src/my-place/visit-detector/VisitDetector.cpp
@@ -29,7 +29,7 @@
 #include <gmodule.h>
 #include <DatabaseManager.h>
 
-#define SO_PATH "/usr/lib/context-service/libctx-prvd-my-place-visit-categer.so"
+#define SO_PATH _LIBDIR_ "context-service/libctx-prvd-my-place-visit-categer.so"
 
 typedef void (*visit_categer_t)(ctx::Visit &visit);