summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukasz Stanislawski <l.stanislaws@samsung.com>2016-03-24 12:20:08 +0100
committerLukasz Stanislawski <l.stanislaws@samsung.com>2016-03-30 13:46:55 -0700
commita599766c61f457e37e4b8e84ca9b188d2fea1eec (patch)
treeff3416ade867000f1a36cc506aa220079e29bad7
parent6792efb6a25cc3beb70ce7dd3a416d0ab1e19f56 (diff)
downloadindicator-win-a599766c61f457e37e4b8e84ca9b188d2fea1eec.tar.gz
indicator-win-a599766c61f457e37e4b8e84ca9b188d2fea1eec.tar.bz2
indicator-win-a599766c61f457e37e4b8e84ca9b188d2fea1eec.zip
Change indicator data directory
Change-Id: I4259c6e44ed7dd723a257621285653fff7a1211f
-rw-r--r--CMakeLists.txt3
-rw-r--r--packaging/org.tizen.indicator.spec4
2 files changed, 2 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03e6cc3..8f7a7c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,10 +9,9 @@ SET(VENDOR "org.tizen")
SET(PACKAGE ${PROJECT_NAME})
SET(PKGNAME "${VENDOR}.${PACKAGE}")
SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(PREFIXRW ${CMAKE_INSTALL_PREFIXRW})
SET(BINDIR "${PREFIX}/bin")
SET(RESDIR "${PREFIX}/res")
-SET(DATADIR "${PREFIXRW}/data")
+SET(DATADIR "${PREFIX}/data")
SET(LOCALEDIR "${RESDIR}/locale")
SET(ICONDIR "${RESDIR}/icons")
SET(EDJDIR "${RESDIR}/edje")
diff --git a/packaging/org.tizen.indicator.spec b/packaging/org.tizen.indicator.spec
index ac3f7be..0093ca2 100644
--- a/packaging/org.tizen.indicator.spec
+++ b/packaging/org.tizen.indicator.spec
@@ -1,7 +1,6 @@
%define PKGNAME org.tizen.indicator
%define PREFIX /usr/apps/%{PKGNAME}
%define RESDIR %{PREFIX}/res
-%define PREFIXRW /opt/usr/apps/%{PKGNAME}
Name: org.tizen.indicator
Summary: indicator window
@@ -80,7 +79,7 @@ CFLAGS+=" -fvisibility=hidden"; export CFLAGS
CXXFLAGS+=" -fvisibility=hidden -fvisibility-inlines-hidden"; export CXXFLAGS
FFLAGS+=" -fvisibility=hidden -fvisibility-inlines-hidden"; export FFLAGS
-cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DCMAKE_INSTALL_PREFIXRW=%{PREFIXRW} \
+cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX}
make %{?jobs:-j%jobs}
@@ -112,7 +111,6 @@ rm -rf %{buildroot}
%{RESDIR}/icons/*
%{RESDIR}/edje/*
/usr/share/packages/%{PKGNAME}.xml
-%attr(775,app,app) %{PREFIXRW}/data
%attr(755,-,-) %{_sysconfdir}/init.d/indicator
/usr/share/license/%{PKGNAME}
/usr/apps/%{PKGNAME}/author-signature.xml