sensor: change the hard coded path for supporting 64bit platform

Change-Id: Ie1940344d79527a4fe153491a566b32da46c9f2d
Signed-off-by: kibak.yoon <kibak.yoon@samsung.com>
(cherry picked from commit 7e249a8b19cea3f6c11968942460eb75da382fb1)

diff --git a/packaging/sensord.spec b/packaging/sensord.spec
index fe4facf..b1439b8 100644 (file)
--- a/packaging/sensord.spec
+++ b/packaging/sensord.spec
@@ -20,10 +20,6 @@ BuildRequires:  pkgconfig(cynara-client)
 BuildRequires:  pkgconfig(cynara-session)
 Requires:   libsensord = %{version}-%{release}
 
-%ifarch %{ix86} x86_64
-%define BUILD_ARCH EMULATOR
-%endif
-
 %description
 Sensor daemon
 
@@ -61,8 +57,8 @@ Sensor functional testing
 %setup -q
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DMAJORVER=${MAJORVER} -DFULLVER=%{version} \
-       -DARCH=%{BUILD_ARCH}
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIBDIR=%{_libdir} \
+        -DMAJORVER=${MAJORVER} -DFULLVER=%{version}
 
 %build
 make %{?jobs:-j%jobs}

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 763e904..c71bcec 100644 (file)
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -8,6 +8,7 @@ PKG_CHECK_MODULES(SERVER_PKGS REQUIRED ${DEPENDENTS})
 
 ADD_SUBDIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../sensor ${CMAKE_CURRENT_BINARY_DIR}/sensor)
 ADD_DEFINITIONS(${SENSOR_DEFINITIONS})
+ADD_DEFINITIONS(-DLIBDIR="${LIBDIR}")
 
 FOREACH(flag ${SERVER_PKGS_CFLAGS})
        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")

diff --git a/src/server/sensor_loader.cpp b/src/server/sensor_loader.cpp
index 21694c8..89d678b 100644 (file)
--- a/src/server/sensor_loader.cpp
+++ b/src/server/sensor_loader.cpp
@@ -57,7 +57,7 @@
 using std::vector;
 using std::string;
 
-#define DEVICE_HAL_DIR_PATH "/usr/lib/sensor"
+#define DEVICE_HAL_DIR_PATH LIBDIR "/sensor"
 
 sensor_loader::sensor_loader()
 {