common: change directory pathes to macros

- hard-coded directory pathes are exchanged to macros

Change-Id: I8bc295b816ef1e772358f5f60820895168e78be6
Signed-off-by: Taeyoung Kim <ty317.kim@samsung.com>

diff --git a/packaging/crash-worker.spec b/packaging/crash-worker.spec
index b270b9e..aa0a273 100644 (file)
--- a/packaging/crash-worker.spec
+++ b/packaging/crash-worker.spec
@@ -21,7 +21,8 @@ crash-manager
 %setup -q
 
 #Path to store logs and coredump files
-%define crash_path %{TZ_SYS_SHARE}/crash/dump
+%define crash_root_path %{TZ_SYS_SHARE}/crash
+%define crash_path      %{crash_root_path}/dump
 
 %build
 cp %{SOURCE1001} .
@@ -30,14 +31,15 @@ export CFLAGS+=" -Werror"
 
 %cmake . \
           -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+          -DTZ_SYS_BIN=%{TZ_SYS_BIN} \
           -DCRASH_PATH=%{crash_path}
 make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
 %make_install
-mkdir -p %{buildroot}/opt/usr/share/crash
-mkdir -p %{buildroot}/opt/usr/share/crash/dump
+mkdir -p %{buildroot}%{crash_root_path}
+mkdir -p %{buildroot}%{crash_path}
 
 %install_service sysinit.target.wants crash-manager.service
 
@@ -45,9 +47,9 @@ mkdir -p %{buildroot}/opt/usr/share/crash/dump
 %license LICENSE
 %manifest crash-worker.manifest
 %defattr(-,system,system,-)
-%dir /opt/usr/share/crash
-%dir /opt/usr/share/crash/dump
-%attr(0755,system,system)/usr/bin/dump_systemstate
+%dir %{crash_root_path}
+%dir %{crash_path}
+%attr(0755,system,system) %{_bindir}/dump_systemstate
 %{_bindir}/crash-manager.sh
 %{_bindir}/set_corepattern.sh
 %{_unitdir}/crash-manager.service

diff --git a/src/crash-manager/CMakeLists.txt b/src/crash-manager/CMakeLists.txt
index b61603a..ac53821 100644 (file)
--- a/src/crash-manager/CMakeLists.txt
+++ b/src/crash-manager/CMakeLists.txt
@@ -6,12 +6,12 @@ CONFIGURE_FILE(${CRASH_MANAGER}.sh.in ${CRASH_MANAGER}.sh @ONLY)
 CONFIGURE_FILE(set_corepattern.sh.in set_corepattern.sh @ONLY)
 
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/src/${CRASH_MANAGER}/${CRASH_MANAGER}.sh
-               DESTINATION /usr/bin
+               DESTINATION ${TZ_SYS_BIN}
                PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
                GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/src/${CRASH_MANAGER}/set_corepattern.sh
-               DESTINATION /usr/bin
+               DESTINATION ${TZ_SYS_BIN}
                PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
                GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)