From: Kim Tae Soo Date: Thu, 29 Jan 2015 02:18:33 +0000 (+0900) Subject: Fix build error due to deleting the folder "demosongs" X-Git-Tag: accepted/tizen/tv/20150129.040729^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=76ec1148af44260f0c3a94e670494284f53724d4;p=profile%2Ftv%2Fapps%2Fnative%2Fmusicplayer.git Fix build error due to deleting the folder "demosongs" Change-Id: Id971f09c18a1b86c01d8f253b7a86bda79d797cf Signed-off-by: Kim Tae Soo --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 518e81b..b790a64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,9 +40,9 @@ ENDIF(NOT DEFINED IMAGEDIR) IF(NOT DEFINED MANIFESTDIR) SET(MANIFESTDIR "/usr/share/packages") ENDIF(NOT DEFINED MANIFESTDIR) -IF(NOT DEFINED MEDIA_AUDIO_DIR) - SET(MEDIA_AUDIO_DIR "/opt/usr/media/Sounds") -ENDIF(NOT DEFINED MEDIA_AUDIO_DIR) +#IF(NOT DEFINED MEDIA_AUDIO_DIR) +# SET(MEDIA_AUDIO_DIR "/opt/usr/media/Sounds") +#ENDIF(NOT DEFINED MEDIA_AUDIO_DIR) IF(NOT DEFINED DESKTOP_ICONDIR) SET(DESKTOP_ICONDIR "/usr/share/icons/default/small") ENDIF(NOT DEFINED DESKTOP_ICONDIR) @@ -126,7 +126,7 @@ INSTALL(FILES ${PACKAGE_NAME}.xml DESTINATION ${MANIFESTDIR}) INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/images DESTINATION ${RESDIR}) INSTALL(FILES ${CMAKE_SOURCE_DIR}/icons/${DESKTOP_ICON} DESTINATION ${DESKTOP_ICONDIR}) INSTALL(FILES ${CMAKE_SOURCE_DIR}/icons/${LANDSCAPE_ICON} DESTINATION ${DESKTOP_ICONDIR}) -INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/demosongs DESTINATION ${MEDIA_AUDIO_DIR}) +#INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/demosongs DESTINATION ${MEDIA_AUDIO_DIR}) #i18n ADD_SUBDIRECTORY(po) diff --git a/packaging/org.tizen.music-player-tv-ref.spec b/packaging/org.tizen.music-player-tv-ref.spec old mode 100755 new mode 100644 index cfec9df..e739785 --- a/packaging/org.tizen.music-player-tv-ref.spec +++ b/packaging/org.tizen.music-player-tv-ref.spec @@ -31,7 +31,6 @@ BuildRequires: gettext-devel %define _resdir %{_pkgdir}/res %define _localedir %{_resdir}/locale %define _manifestdir /usr/share/packages -%define _media_audiodir /opt/usr/media/Sounds %define _desktop_icondir /usr/share/icons/default/small %description @@ -47,7 +46,6 @@ cmake \ -DBINDIR=%{_bindir} \ -DLOCALEDIR=%{_localedir} \ -DMANIFESTDIR=%{_manifestdir} \ - -DMEDIA_AUDIO_DIR=%{_media_audiodir} \ -DDESKTOP_ICONDIR=%{_desktop_icondir} \ -DVERSION=%{version} @@ -66,6 +64,5 @@ rm -rf %{buildroot} %{_bindir}/* %{_resdir}/* %{_manifestdir}/%{name}.xml -%{_media_audiodir}/* %{_desktop_icondir}/%{name}.png %{_desktop_icondir}/%{name}_4x2.png