Change include directory path

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f50d5d..21b3e92 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ SET(SRCS
        src/activity/activity.cpp
 )
 
-# Dependencies
+SET(inc_subdir "context-service")
 SET(dependency "dlog glib-2.0 capi-base-common capi-system-info sensor")
 
 # Target lib (for backward compatibility, the below old naming is used)
@@ -45,7 +45,7 @@ SET_TARGET_PROPERTIES(${target} PROPERTIES VERSION ${FULLVER})
 # Install
 INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries)
 INSTALL(
-       DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include/motion
+       DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${inc_subdir}
        FILES_MATCHING PATTERN "*.h"
 )
 
@@ -53,15 +53,15 @@ SET(VERSION ${FULLVER})
 SET(PC_PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(PC_NAME ${target})
 SET(PC_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-SET(PC_INCLUDE "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/motion")
+SET(PC_INCLUDE "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/${inc_subdir}")
 SET(PC_DESCRIPTION "Tizen Native Motion Recognition API")
 SET(PC_REQUIRED ${dependency})
 SET(PC_LDFLAGS -l${target})
-SET(PC_CFLAGS -I\${includedir}/motion)
+SET(PC_CFLAGS -I\${includedir}/${inc_subdir})
 
 CONFIGURE_FILE(
-       motion.pc.in
-       ${CMAKE_CURRENT_SOURCE_DIR}/motion.pc
+       ${PROJECT_NAME}.pc.in
+       ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc
        @ONLY
 )
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/motion.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

diff --git a/packaging/motion.spec b/packaging/motion.spec
index c5de290..ebad3a4 100644 (file)
--- a/packaging/motion.spec
+++ b/packaging/motion.spec
@@ -51,9 +51,9 @@ rm -rf %{buildroot}
 %make_install
 
 mkdir -p %{buildroot}/usr/share/license
-cp LICENSE %{buildroot}/usr/share/license/motion
+cp LICENSE %{buildroot}/usr/share/license/%{name}
 # For backward compatibility
-ln -s ./motion.pc %{buildroot}/%{_libdir}/pkgconfig/libcore-context-manager.pc
+ln -s ./%{name}.pc %{buildroot}/%{_libdir}/pkgconfig/libcore-context-manager.pc
 
 %post
 /sbin/ldconfig
@@ -62,15 +62,15 @@ ln -s ./motion.pc %{buildroot}/%{_libdir}/pkgconfig/libcore-context-manager.pc
 /sbin/ldconfig
 
 %files
-%manifest packaging/motion.manifest
+%manifest packaging/%{name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/*.so*
-/usr/share/license/motion
+/usr/share/license/%{name}
 
 %package devel
 Summary:       Tizen Native Motion Recognition API (Development)
 Group:         Framework/context
-Requires:      motion = %{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 
 %description devel
 Tizen Native Motion Recognition API (Development)
@@ -83,5 +83,5 @@ Tizen Native Motion Recognition API (Development)
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/motion/*.h
+%{_includedir}/*/*.h
 %{_libdir}/pkgconfig/*.pc