From c26e43610895d317b89db8476294ab171afbf01d Mon Sep 17 00:00:00 2001 From: "jin0.kim" Date: Fri, 25 Mar 2016 16:40:25 +0830 Subject: [PATCH] Remove data folder in /opt/usr/apps/ Change-Id: I32068d0a6b4db30896ba8d20112ac09cdbd681e7 --- CMakeLists.txt | 3 --- packaging/org.tizen.quickpanel.spec | 3 --- 2 files changed, 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8cdf081..adde076 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,7 +78,6 @@ SET(LOCALEDIR "${RESDIR}/locale") SET(ICONDIR "${RESDIR}/icons") SET(EDJDIR "${RESDIR}/edje") SET(DATADIR "${PREFIX}/data") -SET(DATADIR_RW "/opt/usr/apps/${PKGNAME}/data") SET(DESKTOPDIR "/usr/share/applications") SET(MANIFESTXMLDIR "/usr/share/packages") SET(SHARED_DIR "${PREFIX}/shared/res") @@ -177,7 +176,6 @@ ADD_DEFINITIONS("-DLOCALEDIR=\"${LOCALEDIR}\"") ADD_DEFINITIONS("-DICONDIR=\"${ICONDIR}\"") ADD_DEFINITIONS("-DEDJDIR=\"${EDJDIR}\"") ADD_DEFINITIONS("-DDATADIR=\"${DATADIR}\"") -ADD_DEFINITIONS("-DDATADIR_RW=\"${DATADIR_RW}\"") ADD_DEFINITIONS("-DSHARED_DIR=\"${SHARED_DIR}\"") #ADD_DEFINITIONS("-DFILE_DEBUG") @@ -191,7 +189,6 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} ${x11_pkgs_LDFLAGS} "-pie" INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR}) INSTALL(DIRECTORY DESTINATION ${DATADIR}) -INSTALL(DIRECTORY DESTINATION ${DATADIR_RW}) INSTALL(FILES ${CMAKE_SOURCE_DIR}/icons/quickpanel_icon_default.png DESTINATION ${RESDIR}) # icon for setting diff --git a/packaging/org.tizen.quickpanel.spec b/packaging/org.tizen.quickpanel.spec index b789c40..8d502b2 100755 --- a/packaging/org.tizen.quickpanel.spec +++ b/packaging/org.tizen.quickpanel.spec @@ -102,9 +102,6 @@ rm -rf %{buildroot} %manifest %{name}.manifest %defattr(-,root,root,-) %attr(755,-,-) %{_sysconfdir}/init.d/quickpanel -%attr(775,app,app) /opt/%{_prefix}/apps/%{name}/ -%attr(775,app,app) /opt/%{_prefix}/apps/%{name}/data -/opt/%{_prefix}/apps/%{name}/data %{_prefix}/apps/%{name} %{_prefix}/share/packages/%{name}.xml %{_prefix}/share/license/%{name} -- 2.7.4