Added libtzplatform-config package for following the Tizen Directory rules.

Change-Id: I134e004c9ceeb0bf406f0ba3939852c101efcd31

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 096a9bf..10f3598 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,6 +30,7 @@ pkg_check_modules(PKGS REQUIRED
                tv-service
                dlog
                alarm-service
+               libtzplatform-config
                )
 
 IF(NOT DEFINED PACKAGE_NAME)
@@ -51,7 +52,7 @@ IF(NOT DEFINED LOCALEDIR)
        SET(LOCALEDIR "${RESDIR}/locale")
 ENDIF(NOT DEFINED LOCALEDIR)
 IF(NOT DEFINED PACKAGEDIR)
-       SET(PACKAGEDIR "/usr/share/packages")
+       SET(PACKAGEDIR "${TZ_SYS_RO_PACKAGES}")
 ENDIF(NOT DEFINED PACKAGEDIR)
 IF(NOT DEFINED DESKTOP_ICONDIR)
        SET(DESKTOP_ICONDIR "/usr/share/icons")
@@ -119,6 +120,7 @@ ADD_DEFINITIONS("-DPACKAGE=\"${PACKAGE_NAME}\"")
 ADD_DEFINITIONS("-DEDJEDIR=\"${EDJEDIR}\"")
 ADD_DEFINITIONS("-DEDJEFILE=\"${EDJEDIR}/${TARGET_EDJ}\"")
 ADD_DEFINITIONS("-DTHEMEFILE=\"${EDJEDIR}/${THEME_EDJ}\"")
+ADD_DEFINITIONS("-DTZ_SYS_RO_APPS=\"${TZ_SYS_RO_APPS}\"")
 
 FOREACH(flag ${PKGS_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/include/app_string.h b/include/app_string.h
index d73a016..804f3c1 100644 (file)
--- a/include/app_string.h
+++ b/include/app_string.h
@@ -18,7 +18,7 @@
 #define __AIR_SETTINGS_APP_STRING_H__
 
 #define SETTINGS_PACKAGE                       "settings"
-#define SETTINGS_LOCALEDIR             "/usr/apps/org.tizen.settings/res/locale"
+#define SETTINGS_LOCALEDIR             TZ_SYS_RO_APPS"/org.tizen.settings/res/locale"
 
 #ifdef _
 #undef _

diff --git a/packaging/org.tizen.settings.spec b/packaging/org.tizen.settings.spec
index cd19f5d..013de56 100644 (file)
--- a/packaging/org.tizen.settings.spec
+++ b/packaging/org.tizen.settings.spec
@@ -9,6 +9,7 @@ Source1: %{name}.manifest
 
 BuildRequires: cmake
 BuildRequires: gettext-tools
+BuildRequires: pkgconfig(libtzplatform-config)
 BuildRequires: pkgconfig(elementary)
 BuildRequires: pkgconfig(capi-appfw-application)
 BuildRequires: pkgconfig(capi-system-info)
@@ -23,12 +24,12 @@ BuildRequires: pkgconfig(vconf)
 BuildRequires: pkgconfig(alarm-service)
 Requires(post): /usr/bin/vconftool
 
-%define _appdir /usr/apps/%{name}
+%define _appdir /%{TZ_SYS_RO_APPS}/%{name}
 %define _bindir %{_appdir}/bin
 %define _resdir %{_appdir}/res
 %define _edjedir %{_resdir}/edje
 %define _pkgdir %{_datadir}/packages
-%define _desktop_icondir /usr/share/icons
+%define _desktop_icondir %{TZ_SYS_RO_ICONS}
 
 %description
 Setting application.
@@ -45,6 +46,8 @@ cmake \
        -DBINDIR=%{_bindir} \
        -DRESDIR=%{_resdir} \
        -DEDJEDIR=%{_edjedir} \
+       -DTZ_SYS_RO_PACKAGES=%{TZ_SYS_RO_PACKAGES} \
+       -DTZ_SYS_RO_APPS=%{TZ_SYS_RO_APPS} \
        -DDESKTOP_ICONDIR=%{_desktop_icondir} \
        -DDESKTOP_ICON=%{name}.png \
        -DPACKAGEDIR=%{_pkgdir}