Directory migration

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8b258b..db1aff2 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ INCLUDE_DIRECTORIES(${INC_DIR})
 SET(pc_dependents "capi-base-common")
 
 INCLUDE(FindPkgConfig)
-       pkg_check_modules(dependents REQUIRED dlog lbs-location capi-base-common capi-system-info)
+       pkg_check_modules(dependents REQUIRED dlog lbs-location capi-base-common capi-system-info libtzplatform-config)
 
 FOREACH(flag ${dependents_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/packaging/capi-location-manager.spec b/packaging/capi-location-manager.spec
index cc34a63..560e626 100644 (file)
--- a/packaging/capi-location-manager.spec
+++ b/packaging/capi-location-manager.spec
@@ -12,6 +12,7 @@ BuildRequires: pkgconfig(lbs-location)
 BuildRequires: pkgconfig(capi-base-common)
 BuildRequires: pkgconfig(capi-system-info)
 BuildRequires: pkgconfig(vconf)
+BuildRequires: pkgconfig(libtzplatform-config)
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -40,7 +41,7 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIBDIR=%{_libdir} -DINCLUDEDIR=%{_includedir} \
--DFULLVER=%{version} -DMAJORVER=${MAJORVER} \
+-DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DTZ_SYS_RO_PACKAGES=%{TZ_SYS_RO_PACKAGES} -DTZ_SYS_RW_APP=%{TZ_SYS_RW_APP} \
 
 make %{?jobs:-j%jobs}
 
@@ -77,6 +78,6 @@ Test application of Location Manager
 
 %files test
 %manifest test/capi-location-manager-test.manifest
-#/usr/share/packages/capi-location-manager-test.xml
-/opt/usr/devel/location/location_test
+%{TZ_SYS_RO_PACKAGES}/capi-location-manager-test.xml
+%{TZ_SYS_RW_APP}/test/location/location_test
 %endif

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2a428b4..6f1e359 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -17,5 +17,5 @@ FOREACH(src ${sources})
        TARGET_LINK_LIBRARIES(${src_name} ${fw_name} ${${fw_test}_LDFLAGS})
 ENDFOREACH()
 
-INSTALL(TARGETS ${src_name} DESTINATION /opt/usr/devel/location/)
-#INSTALL(FILES ${fw_test}.xml DESTINATION /usr/share/packages)
+INSTALL(TARGETS ${src_name} DESTINATION ${TZ_SYS_RW_APP}/test/location/)
+INSTALL(FILES ${fw_test}.xml DESTINATION ${TZ_SYS_RO_PACKAGES}/)

diff --git a/test/capi-location-manager-test.xml b/test/capi-location-manager-test.xml
index 1a8da2b..c1ed32e 100644 (file)
--- a/test/capi-location-manager-test.xml
+++ b/test/capi-location-manager-test.xml
@@ -8,7 +8,7 @@
                <privilege>http://tizen.org/privilege/location</privilege>
                <privilege>http://tizen.org/privilege/location.enable</privilege>
        </privileges>
-       <ui-application appid="capi-location-manager-test" exec="/opt/usr/devel/location/location-test" nodisplay="true" multiple="false" type="capp" taskmanage="false" launch_mode="single">
+       <ui-application appid="capi-location-manager-test" exec=${TZ_SYS_RW_APP}"/test/location/location-test" nodisplay="true" multiple="false" type="capp" taskmanage="false" launch_mode="single">
                <label>Location Manager Test</label>
        </ui-application>
 </manifest>