Fix library installation path in 64-bit environment

Change-Id: I5475d887b1d3d79fc4b9e316f0d4bddb531940a1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7cffd4..7469e63 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,7 @@ SET(DBUS_IFACE "${CMAKE_SOURCE_DIR}/dbus-interface")
 SET(DATA_DIR ${CMAKE_SOURCE_DIR}/res)
 SET(DB_OBJ "STC_DB")
 
+ADD_DEFINITIONS(-DLIBDIR="${LIBDIR}")
 ADD_DEFINITIONS("-DUSE_DLOG")
 
 ADD_SUBDIRECTORY(dbus-interface)

diff --git a/manager/stcmgr-plugin-appstatus.h b/manager/stcmgr-plugin-appstatus.h
index 84753fc..ccc3c7f 100644 (file)
--- a/manager/stcmgr-plugin-appstatus.h
+++ b/manager/stcmgr-plugin-appstatus.h
@@ -17,7 +17,7 @@
 #ifndef __STC_MANAGER_PLUGIN_APPSTATUS_H__
 #define __STC_MANAGER_PLUGIN_APPSTATUS_H__
 
-#define STC_PLUGIN_APPSTATUS_FILEPATH          "/usr/lib/stc-plugin-appstatus.so"
+#define STC_PLUGIN_APPSTATUS_FILEPATH          LIBDIR "/stc-plugin-appstatus.so"
 
 #include "stc-plugin-iface-appstatus.h"
 

diff --git a/manager/stcmgr-plugin-exception.h b/manager/stcmgr-plugin-exception.h
index fa1e45f..608ba23 100644 (file)
--- a/manager/stcmgr-plugin-exception.h
+++ b/manager/stcmgr-plugin-exception.h
@@ -19,7 +19,7 @@
 
 #include "stc-plugin-exception.h"
 
-#define STC_PLUGIN_EXCEPTION_FILEPATH          "/usr/lib/stc-plugin-exception.so"
+#define STC_PLUGIN_EXCEPTION_FILEPATH          LIBDIR "/stc-plugin-exception.so"
 
 #include "stc-plugin-iface-exception.h"
 

diff --git a/manager/stcmgr-plugin-firewall.h b/manager/stcmgr-plugin-firewall.h
index 00b53bb..b5ad893 100644 (file)
--- a/manager/stcmgr-plugin-firewall.h
+++ b/manager/stcmgr-plugin-firewall.h
@@ -20,7 +20,7 @@
 #include "stc-plugin-firewall.h"
 #include "stc-plugin-iface-firewall.h"
 
-#define STC_PLUGIN_FIREWALL_FILEPATH           "/usr/lib/stc-plugin-firewall.so"
+#define STC_PLUGIN_FIREWALL_FILEPATH           LIBDIR "/stc-plugin-firewall.so"
 
 int stc_plugin_firewall_init(void);
 int stc_plugin_firewall_deinit(void);

diff --git a/manager/stcmgr-plugin-monitor.h b/manager/stcmgr-plugin-monitor.h
index 758ffa9..61213ae 100644 (file)
--- a/manager/stcmgr-plugin-monitor.h
+++ b/manager/stcmgr-plugin-monitor.h
@@ -19,7 +19,7 @@
 #include "stc-plugin-monitor.h"
 #include "stc-plugin-iface-monitor.h"
 
-#define STC_PLUGIN_MONITOR_FILEPATH            "/usr/lib/stc-plugin-monitor.so"
+#define STC_PLUGIN_MONITOR_FILEPATH            LIBDIR "/stc-plugin-monitor.so"
 
 int stc_plugin_monitor_init(stc_manager_stop_cb stop_cb);
 int stc_plugin_monitor_deinit(void);

diff --git a/manager/stcmgr-plugin-pcap.h b/manager/stcmgr-plugin-pcap.h
index 85ad9d6..02fa213 100644 (file)
--- a/manager/stcmgr-plugin-pcap.h
+++ b/manager/stcmgr-plugin-pcap.h
@@ -17,7 +17,7 @@
 #ifndef __STC_MANAGER_PLUGIN_PCAP_H__
 #define __STC_MANAGER_PLUGIN_PCAP_H__
 
-#define STC_PLUGIN_PCAP_FILEPATH               "/usr/lib/stc-plugin-pcap.so"
+#define STC_PLUGIN_PCAP_FILEPATH               LIBDIR "/stc-plugin-pcap.so"
 
 #include "stc-plugin-iface-pcap.h"
 

diff --git a/manager/stcmgr-plugin-procfs.h b/manager/stcmgr-plugin-procfs.h
index 8320852..31aa820 100644 (file)
--- a/manager/stcmgr-plugin-procfs.h
+++ b/manager/stcmgr-plugin-procfs.h
@@ -17,7 +17,7 @@
 #ifndef __STC_MANAGER_PLUGIN_PROCFS_H__
 #define __STC_MANAGER_PLUGIN_PROCFS_H__
 
-#define STC_PLUGIN_PROCFS_FILEPATH             "/usr/lib/stc-plugin-procfs.so"
+#define STC_PLUGIN_PROCFS_FILEPATH             LIBDIR "/stc-plugin-procfs.so"
 
 #include "stc-plugin-iface-procfs.h"
 

diff --git a/manager/stcmgr-plugin-tether.h b/manager/stcmgr-plugin-tether.h
index d195521..43a616e 100644 (file)
--- a/manager/stcmgr-plugin-tether.h
+++ b/manager/stcmgr-plugin-tether.h
@@ -17,7 +17,7 @@
 #ifndef __STC_MANAGER_PLUGIN_TETHER_H__
 #define __STC_MANAGER_PLUGIN_TETHER_H__
 
-#define STC_PLUGIN_TETHER_FILEPATH             "/usr/lib/stc-plugin-tether.so"
+#define STC_PLUGIN_TETHER_FILEPATH             LIBDIR "/stc-plugin-tether.so"
 
 #include "stc-plugin-tether.h"
 #include "stc-plugin-iface-tether.h"