Remove hardcoded path for multiuser support

We remove bt-share hardcoded path for multiuser support.

Change-Id: I3e486d9897b2e9285d3fcad83a4155648d875363
Signed-off-by: Taejin Woo <tt.woo@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4cd5fa6..92e437a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,10 +77,10 @@ ${CMAKE_CURRENT_SOURCE_DIR}/data/custom_popup.edc
 ADD_DEPENDENCIES(${PROJECT_NAME} custom_popup.edj)
 
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /opt/apps/org.tizen.bt-syspopup/bin)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${TZ_SYS_RW_APP}/org.tizen.bt-syspopup/bin)
 
 # install desktop file & icon
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 INSTALL(FILES ${CMAKE_BINARY_DIR}/data/org.tizen.bt-syspopup.xml DESTINATION /usr/share/packages/)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/org.tizen.bt-syspopup.png DESTINATION /opt/share/icons/default/small)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/custom_popup.edj DESTINATION /opt/apps/org.tizen.bt-syspopup/res/edje)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/org.tizen.bt-syspopup.png DESTINATION ${TZ_SYS_SHARE}/icons/default/small)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/custom_popup.edj DESTINATION ${TZ_SYS_RW_APP}/org.tizen.bt-syspopup/res/edje)

diff --git a/packaging/org.tizen.bt-syspopup.spec b/packaging/org.tizen.bt-syspopup.spec
index e288d54..ec7916f 100644 (file)
--- a/packaging/org.tizen.bt-syspopup.spec
+++ b/packaging/org.tizen.bt-syspopup.spec
@@ -32,6 +32,7 @@ BuildRequires:  pkgconfig(bluetooth-api)
 BuildRequires:  pkgconfig(feedback)
 BuildRequires:  sysman-internal-devel
 BuildRequires:  edje-tools
+BuildRequires:  pkgconfig(libtzplatform-config)
 
 BuildRequires:  cmake
 BuildRequires:  gettext-devel
@@ -58,6 +59,11 @@ cmake . \
 
 make %{?jobs:-j%jobs}
 
+%cmake . \
+       -DTZ_SYS_RW_APP=%{TZ_SYS_RW_APP} \
+       -DTZ_SYS_SHARE=%{TZ_SYS_SHARE}
+make
+
 %install
 rm -rf %{buildroot}
 %make_install

diff --git a/src/bt-syspopup.h b/src/bt-syspopup.h
index 0e693e7..afc3710 100644 (file)
--- a/src/bt-syspopup.h
+++ b/src/bt-syspopup.h
@@ -27,7 +27,7 @@
 #endif
 
 #ifndef PREFIX
-#define PREFIX "/opt/apps"PACKAGE_NAME
+#define PREFIX tzplatform_mkpath(TZ_SYS_RW_APP, PACKAGE_NAME);
 #endif
 
 #define EXPORT __attribute__((visibility("default")))