modified path of lib directory

Signed-off-by: jomui <jongmun.woo@samsung.com>
Change-Id: I4575cbdcf4c3e8961cdd7f8c4adec0020047fe31

diff --git a/AUTHORS b/AUTHORS
index a8e91dbf588426f70240cfb8cd691b6c69c59ef2..352857d51a24417fa0627e23de74662ee001142b 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,8 +1,5 @@
+Jongmun Woo <jongmun.woo@samsung.com>\r
 Young-Ae Kang <youngae.kang@samsung.com>\r
-JongMun Woo <jongmun.woo@samsung.com>\r
 Kyoungjun Sung <kj7.sung@samsung.com>\r
-Woo-Young Kim <woo02.kim@samsung.com>\r
-Bono Koo <mw.koo@samsung.com>\r
-Ki-Sun SHIN <kisun47.shin@samsung.com>\r
-bosung kwak <bosung.kwak@samsung.com>\r
-Areum Choi <arumi.choi@samsung.com>\r
+Karthik Paulraj <p.karthik@samsung.com>\r
+VENKATAKOTIVIJAYALAKSHMINARAYA <lnarayana.k@samsung.com>\r

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f76395d6f4fa3dce8b8955d22aa5f1c8eb6f849b..47f701f3bfc0852e87a98a185be4619cb4829953 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,7 @@ PROJECT(${fw_name})
 SET(CMAKE_INSTALL_PREFIX /usr)
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(LIBDIR ${LIBDIR})
+SET(LIB_PATH ${LIBDIR}/geofence/module)
 
 SET(INC_DIR
     include
@@ -22,6 +23,7 @@ SET(pc_dependents "capi-base-common")
 IF(ENABLE_GEOFENCE)
        ADD_DEFINITIONS(-DENABLE_GEOFENCE)
 ENDIF(ENABLE_GEOFENCE)
+ADD_DEFINITIONS("-DMODULE_PATH_PREFIX=\"${LIB_PATH}\"")
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(${fw_name} REQUIRED ${dependents})

diff --git a/packaging/capi-geofence-manager.spec b/packaging/capi-geofence-manager.spec
index 2d354ab879e28bf3783f9acfc649074d512ebd8e..fde82107df50b60dae1a8854a2deb9ad445324d7 100644 (file)
--- a/packaging/capi-geofence-manager.spec
+++ b/packaging/capi-geofence-manager.spec
@@ -7,11 +7,12 @@ Group:      Location/API
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 
-%if "%{?tizen_profile_name}" == "tv"
+%if "%{?profile}" == "tv"
 ExcludeArch: %{arm} %ix86 x86_64
 %endif
 
 BuildRequires:  cmake
+#BuildRequires:  model-build-features
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(capi-base-common)
 BuildRequires:  pkgconfig(vconf)
@@ -26,12 +27,11 @@ Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
 %description
-
+A Geofence Manager library in Tizen Native API
 
 %prep
 %setup -q
 
-
 %build
 export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
 export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
@@ -65,6 +65,7 @@ Group:    Location/API
 Requires: %{name} = %{version}-%{release}
 
 %description devel
+A Geofence Manager library in Tizen Native API (Development)
 
 
 %files devel

diff --git a/src/geofence_manager.c b/src/geofence_manager.c
index 52a6818e6e8e280f19b608cc1ab8fd5a0a2509d3..3a4dd5a8bdc8332a3c4f242199a7690e7e073d1c 100644 (file)
--- a/src/geofence_manager.c
+++ b/src/geofence_manager.c
@@ -208,7 +208,9 @@ static bool __is_fence_started(int fence_id)
 EXPORT_API int geofence_manager_is_supported(bool *supported)
 {
        GEOFENCE_LOGD("geofence_manager_is_supported");
-
+#ifndef ENABLE_GEOFENCE
+       return GEOFENCE_MANAGER_ERROR_NOT_SUPPORTED;
+#endif
        GEOFENCE_NULL_ARG_CHECK(supported);
 
        *supported = geofence_is_supported();

diff --git a/src/module/module-internal.c b/src/module/module-internal.c
index cc2a923f07d5965b2bfdd6ae8fe8a00f723b1724..5820645c05294becbdb9507edaf7f3a2fbfc5f4f 100644 (file)
--- a/src/module/module-internal.c
+++ b/src/module/module-internal.c
@@ -23,7 +23,6 @@
 #include "module-internal.h"
 
 #define MAX_MODULE_INDEX 4
-const char *MODULE_PATH_PREFIX = "/usr/lib/geofence/module";
 
 static GMod *gmod_new(const char *module_name, gboolean is_resident)
 {