Align the lib directory path with the header path

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10eb09c1df13f3a3c63b471f977c50fd0847fbae..04316da24cce33bb307f78e9d7651d8979142ecd 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(context-provider)
 INCLUDE(GNUInstallDirs)
 SET(target_prefix "ctx-prvd")
+SET(target_dir "context-service")
 
 # Common Options
 INCLUDE_DIRECTORIES(
@@ -24,7 +25,7 @@ ENDIF("${PROFILE}" STREQUAL "wearable")
 
 INSTALL(
        DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
-       DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/context-service/internal
+       DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${target_dir}/internal
        FILES_MATCHING PATTERN "*.h"
 )
 

diff --git a/include/ProviderList.h b/include/ProviderList.h
index e63feb72b1113937bcc95f9d992719767d455f08..7ffcd9c6d76ed138247baa666a52f6633bed2e95 100644 (file)
--- a/include/ProviderList.h
+++ b/include/ProviderList.h
@@ -20,7 +20,7 @@
 #include <ContextProvider.h>
 #include <ProviderTypes.h>
 
-#define LIB_DIRECTORY  "/usr/lib/context/"
+#define LIB_DIRECTORY  "/usr/lib/context-service/"
 #define LIB_PREFIX             "libctx-prvd-"
 #define LIB_EXTENSION  ".so"
 

diff --git a/packaging/context-provider.spec b/packaging/context-provider.spec
index 4f97ae2c11230002ad5f2807a744c7e6e8dc879b..01b83db65fa8a9dba8c351db13865a0d15992256 100644 (file)
--- a/packaging/context-provider.spec
+++ b/packaging/context-provider.spec
@@ -90,7 +90,7 @@ cp LICENSE %{buildroot}/usr/share/license/%{name}
 %defattr(-,root,root,-)
 /usr/share/license/%{name}
 %{_libdir}/*.so*
-%{_libdir}/context/*.so*
+%{_libdir}/context-service/*.so*
 
 %package devel
 Summary:    Context Provider Shared Header (Development)

diff --git a/src/activity/CMakeLists.txt b/src/activity/CMakeLists.txt
index 29e8f5d359ce113bdc12d0997e1c709dfaf6c5a5..7ce6d10f4d5b8476bcd1becf4a46ee175314258a 100644 (file)
--- a/src/activity/CMakeLists.txt
+++ b/src/activity/CMakeLists.txt
@@ -16,4 +16,4 @@ ENDFOREACH(flag)
 ADD_LIBRARY(${target} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${target} ${PKG_ACTIVITY_LDFLAGS} ${target_shared})
 
-INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/context)
+INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${target_dir})

diff --git a/src/app-stats/CMakeLists.txt b/src/app-stats/CMakeLists.txt
index 70b329ed5c025a1a21ecbb680947f4c7f6b4fef6..a11dec1c331beae2154585a5e958ab4e20c582ee 100644 (file)
--- a/src/app-stats/CMakeLists.txt
+++ b/src/app-stats/CMakeLists.txt
@@ -20,4 +20,4 @@ ENDFOREACH(flag)
 ADD_LIBRARY(${target} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${target} ${PKG_APP_LDFLAGS} ${target_shared})
 
-INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/context)
+INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${target_dir})

diff --git a/src/call/CMakeLists.txt b/src/call/CMakeLists.txt
index 8a60b79a872acf001e68fd87791f20b5461a322f..2dbc38ae7fe0c196cc8b4ed66fab948ad9710e4b 100644 (file)
--- a/src/call/CMakeLists.txt
+++ b/src/call/CMakeLists.txt
@@ -17,4 +17,4 @@ ENDFOREACH(flag)
 ADD_LIBRARY(${target} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${target} ${PKG_CALL_LDFLAGS} ${target_shared})
 
-INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/context)
+INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${target_dir})

diff --git a/src/contacts/CMakeLists.txt b/src/contacts/CMakeLists.txt
index 6773a2374b466ebf254aba96dd0254fb274581c8..0d48f20785b5c9708ee8c84480f4f59931ae7581 100644 (file)
--- a/src/contacts/CMakeLists.txt
+++ b/src/contacts/CMakeLists.txt
@@ -16,4 +16,4 @@ ENDFOREACH(flag)
 ADD_LIBRARY(${target} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${target} ${PKG_CONTACTS_LDFLAGS} ${target_shared})
 
-INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/context)
+INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${target_dir})

diff --git a/src/email/CMakeLists.txt b/src/email/CMakeLists.txt
index d6d6687a00a07459ac7485f699b9de171f463bf8..b6c357e135dcdcfcf8b1a9c0f5d8e174cad580de 100644 (file)
--- a/src/email/CMakeLists.txt
+++ b/src/email/CMakeLists.txt
@@ -16,4 +16,4 @@ ENDFOREACH(flag)
 ADD_LIBRARY(${target} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${target} ${PKG_EMAIL_LDFLAGS} ${target_shared})
 
-INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/context)
+INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${target_dir})

diff --git a/src/geofence/CMakeLists.txt b/src/geofence/CMakeLists.txt
index c52a0b08810cb88b2f2e36a458a406a67919b7f7..f2776d10b11d0f3f36a652077607dea2796c85e0 100644 (file)
--- a/src/geofence/CMakeLists.txt
+++ b/src/geofence/CMakeLists.txt
@@ -16,4 +16,4 @@ ENDFOREACH(flag)
 ADD_LIBRARY(${target} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${target} ${PKG_GEOFENCE_LDFLAGS} ${target_shared})
 
-INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/context)
+INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${target_dir})

diff --git a/src/headphone/CMakeLists.txt b/src/headphone/CMakeLists.txt
index 1730405e576b124a9b268c635339f8b55cdf860f..df61ff631348a62df8a5bd377651c978b5d89373 100644 (file)
--- a/src/headphone/CMakeLists.txt
+++ b/src/headphone/CMakeLists.txt
@@ -17,4 +17,4 @@ ENDFOREACH(flag)
 ADD_LIBRARY(${target} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${target} ${PKG_HEADPHONE_LDFLAGS} ${target_shared})
 
-INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/context)
+INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${target_dir})

diff --git a/src/media-stats/CMakeLists.txt b/src/media-stats/CMakeLists.txt
index cb2291645558b5f93fe5ed599d4a97a117cd0a77..cf5e6de70b348878d8594cb1bf1629f7bcaa69ed 100644 (file)
--- a/src/media-stats/CMakeLists.txt
+++ b/src/media-stats/CMakeLists.txt
@@ -16,4 +16,4 @@ ENDFOREACH(flag)
 ADD_LIBRARY(${target} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${target} ${PKG_MEDIA_STATS_LDFLAGS} ${target_shared})
 
-INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/context)
+INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${target_dir})

diff --git a/src/message/CMakeLists.txt b/src/message/CMakeLists.txt
index 0de59a01e1614c5c5a96fc80992ba3dc08af2d11..70561e151209c0ffd567c554c557b25e54a603c8 100644 (file)
--- a/src/message/CMakeLists.txt
+++ b/src/message/CMakeLists.txt
@@ -16,4 +16,4 @@ ENDFOREACH(flag)
 ADD_LIBRARY(${target} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${target} ${PKG_MESSAGE_LDFLAGS} ${target_shared})
 
-INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/context)
+INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${target_dir})

diff --git a/src/my-place/CMakeLists.txt b/src/my-place/CMakeLists.txt
index 5277817ede516739e853ed6d7b25bd093192a5c3..662895b381359b3b3e6bc0f885009d16cf41b141 100644 (file)
--- a/src/my-place/CMakeLists.txt
+++ b/src/my-place/CMakeLists.txt
@@ -17,4 +17,4 @@ ENDFOREACH(flag)
 ADD_LIBRARY(${target} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${target} ${PKG_MYPLACE_LDFLAGS} ${target_shared})
 
-INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/context)
+INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${target_dir})

diff --git a/src/social-stats/CMakeLists.txt b/src/social-stats/CMakeLists.txt
index 004286ef29cfb980c8803bc656a8a9fd9641c5a3..a25e0d8808ea31ff4a710d9003da21ab1fa4e1d1 100644 (file)
--- a/src/social-stats/CMakeLists.txt
+++ b/src/social-stats/CMakeLists.txt
@@ -16,4 +16,4 @@ ENDFOREACH(flag)
 ADD_LIBRARY(${target} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${target} ${PKG_SOCIAL_LDFLAGS} ${target_shared})
 
-INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/context)
+INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${target_dir})

diff --git a/src/system/CMakeLists.txt b/src/system/CMakeLists.txt
index a349974c067df92605935c9255c08ce79c68210e..ee1c8c1aeae3633e100c14f65d12a4ff62a620b9 100644 (file)
--- a/src/system/CMakeLists.txt
+++ b/src/system/CMakeLists.txt
@@ -19,4 +19,4 @@ ENDFOREACH(flag)
 ADD_LIBRARY(${target} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${target} ${PKG_SYSTEM_LDFLAGS} ${target_shared})
 
-INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/context)
+INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${target_dir})

diff --git a/src/time/CMakeLists.txt b/src/time/CMakeLists.txt
index 1ea12afb736b2427ab28c38e9a7f304f11654514..86424410cbc8f64c7de7d98ed61373f225995585 100644 (file)
--- a/src/time/CMakeLists.txt
+++ b/src/time/CMakeLists.txt
@@ -15,4 +15,4 @@ ENDFOREACH(flag)
 ADD_LIBRARY(${target} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${target} ${PKG_TIME_LDFLAGS} ${target_shared})
 
-INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/context)
+INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${target_dir})

diff --git a/src/wifi/CMakeLists.txt b/src/wifi/CMakeLists.txt
index 10ca397793c62fb6ef105acd402864606d1ac19e..20edd33d6eef688484483f333435c7be00d5781d 100644 (file)
--- a/src/wifi/CMakeLists.txt
+++ b/src/wifi/CMakeLists.txt
@@ -16,4 +16,4 @@ ENDFOREACH(flag)
 ADD_LIBRARY(${target} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${target} ${PKG_WIFI_LDFLAGS} ${target_shared})
 
-INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/context)
+INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${target_dir})