Fix media directory path.

  - From /opt/share/settings/settings to /opt/share/settings

Change-Id: I0403259d281ad353156183cb120e4591c142cb10
Signed-off-by: JinWang An <jinwang.an@samsung.com>

diff --git a/setting-profile/include/setting-profile.h b/setting-profile/include/setting-profile.h
index d255b71836ced8f77fd7fca1510f7a8cdf75eb11..bca3a2799f06c823012df67ea844d7bb866c595f 100755 (executable)
--- a/setting-profile/include/setting-profile.h
+++ b/setting-profile/include/setting-profile.h
@@ -34,8 +34,7 @@
 #define VOLUME_APP_NAME "org.tizen.setting.volume"
 #define MAX_SAFETY_VOLUME_LEVEL 10
 #define SETTING_PROFILE_SOUND_ALERTS_PATH   _TZ_SYS_SHARE"/settings/Alerts"
-//#define SETTING_PROFILE_SOUND_RINGTONES_PATH    _TZ_SYS_SHARE"/settings/Ringtones"
-#define SETTING_PROFILE_SOUND_RINGTONES_PATH    "/usr/apps/org.tizen.setting/shared/res/settings/Ringtones"
+#define SETTING_PROFILE_SOUND_RINGTONES_PATH    _TZ_SYS_SHARE"/settings/Ringtones"
 #define SETTING_PROFILE_MMC_PATH        _TZ_SYS_MEDIA"/sdcard"
 #define SETTING_DEFAULT_MSG_TONE        _TZ_SYS_SHARE"/settings/Alerts/Whistle.ogg"
 #define SETTING_DEFAULT_MEDIA_TONE      _TZ_SYS_SHARE"/settings/Previews/Media_preview_Over_the_horizon.ogg"

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6e38a56c528b26b291ecb12e37090b2c2fa238cc..07438959cd85845a22df54cf4710ddc9c43807b0 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -230,7 +230,7 @@ INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/images DESTINATION ${TZ_SYS_RO_AP
 #INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/help DESTINATION ${HELPDATADIR_PH} PATTERN "*")
 
 # install media-data ; should be at /usr/share
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/media/settings DESTINATION ${TZ_SYS_SHARE}/settings PATTERN "*")
+INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/media/settings DESTINATION ${TZ_SYS_SHARE} PATTERN "*")
 #IF("${BUILD_ARCH}" STREQUAL "arm")
 #      INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/media-data-sdk/settings DESTINATION ${TZ_SYS_RO_APP}/org.tizen.setting/shared/res PATTERN "*")
 #ELSE("${BUILD_ARCH}" STREQUAL "arm")