From: Mu-Woong Lee <muwoong.lee@samsung.com>
Date: Tue, 26 Apr 2016 04:41:35 +0000 (+0900)
Subject: Align the lib directory path with the header path
X-Git-Tag: submit/tizen/20160503.015801^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=81e4514fd7e6079acfa8d321d09076ec043d2285;p=platform%2Fcore%2Fcontext%2Fcontext-provider.git

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 10eb09c..04316da 100644
--- 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 e63feb7..7ffcd9c 100644
--- 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 4f97ae2..01b83db 100644
--- 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 29e8f5d..7ce6d10 100644
--- 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 70b329e..a11dec1 100644
--- 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 8a60b79..2dbc38a 100644
--- 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 6773a23..0d48f20 100644
--- 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 d6d6687..b6c357e 100644
--- 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 c52a0b0..f2776d1 100644
--- 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 1730405..df61ff6 100644
--- 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 cb22916..cf5e6de 100644
--- 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 0de59a0..70561e1 100644
--- 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 5277817..662895b 100644
--- 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 004286e..a25e0d8 100644
--- 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 a349974..ee1c8c1 100644
--- 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 1ea12af..8642441 100644
--- 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 10ca397..20edd33 100644
--- 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})