Support /usr/lib64 path for aarch64 build

Change-Id: I3ce3154a6f17095ef020158d795a14d15d94337a
Signed-off-by: kj7.sung <kj7.sung@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca9eef6..43ffc6d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,6 +69,7 @@ ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DEXPORT_API=__attribute__((visibility(\"default\")))")
 #ADD_DEFINITIONS("-DTIZEN_DEBUG")
 ADD_DEFINITIONS("-DTIZEN_VER=${TIZEN_VER}")
+ADD_DEFINITIONS("-DLIBDIR=\"${LIBDIR}\"")
 
 SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined -Wl,--as-needed")
 

diff --git a/capi-maps-service.pc.in b/capi-maps-service.pc.in
index 152508c..8cecc52 100644 (file)
--- a/capi-maps-service.pc.in
+++ b/capi-maps-service.pc.in
@@ -1,8 +1,7 @@
 #Package Information for pkg-config
 
 prefix=@PREFIX@
-exec_prefix=/usr
-libdir=/usr/lib
+libdir=@LIBDIR@
 includedir=@PC_INCLUDE@
 
 Name: @PC_NAME@

diff --git a/src/api/maps_condition.cpp b/src/api/maps_condition.cpp
index 0d9fe6d..98c3906 100644 (file)
--- a/src/api/maps_condition.cpp
+++ b/src/api/maps_condition.cpp
@@ -67,7 +67,6 @@ bool maps_condition_check_privilege(void)
                is_permitted = (ret == MAPS_ERROR_NONE);
 #else
                /* to check for Tizen 3.x privilege */
-               extern const char *MAPS_PLUGINS_PATH_PREFIX;
                is_permitted = (access(MAPS_PLUGINS_PATH_PREFIX, F_OK) != 0) || /* not exist */
                               (access(MAPS_PLUGINS_PATH_PREFIX, R_OK) == 0);   /* readable */
 #endif

diff --git a/src/maps_util.h b/src/maps_util.h
index cc8d87b..5f9f2df 100755 (executable)
--- a/src/maps_util.h
+++ b/src/maps_util.h
@@ -36,6 +36,7 @@
 #define MAPS_BASE_DESC_MAX_LEN 1024
 #define MAPS_BASE_TYPE_MAX_LEN 64
 #define MAPS_BASE_DATE_MAX_LEN 32
+#define MAPS_PLUGINS_PATH_PREFIX       LIBDIR"/maps/plugins"
 
 /*
 * Internal Macros

diff --git a/src/plugin/discovery.cpp b/src/plugin/discovery.cpp
index e40bf7a..b00106f 100644 (file)
--- a/src/plugin/discovery.cpp
+++ b/src/plugin/discovery.cpp
@@ -21,8 +21,6 @@
 #include <glib.h>
 
 
-const char *MAPS_PLUGINS_PATH_PREFIX = "/usr/lib/maps/plugins";
-
 plugin::provider_info plugin::provider_info::empty_instance;
 
 plugin::provider_info::provider_info()

diff --git a/src/plugin/module.cpp b/src/plugin/module.cpp
index 3f32000..fe018fa 100644 (file)
--- a/src/plugin/module.cpp
+++ b/src/plugin/module.cpp
@@ -22,8 +22,6 @@
 #include "command_queue.h"
 #include "empty_module.h"
 
-extern const char *MAPS_PLUGINS_PATH_PREFIX;
-
 plugin::scope_mutex::scope_mutex(GMutex *m) : mutex(m)
 {
        g_mutex_lock(mutex);
@@ -379,8 +377,6 @@ plugin::GMod *plugin::binary_extractor::gmod_new(const string &module_file,
                return NULL;
        }
 
-       /*gmod->path = g_module_build_path(MAPS_PLUGINS_PATH_PREFIX,
-       * gmod->name); */
        gmod->path = g_strnfill(100, 0);
        g_sprintf(gmod->path, "%s/%s", MAPS_PLUGINS_PATH_PREFIX, gmod->name);
        if (!gmod->path) {