From: Hyunsoo, Park Date: Mon, 4 Apr 2016 08:21:56 +0000 (+0900) Subject: update %{TZ_SYS_RO_ETC} to %{_sysconf} because of install directory moving X-Git-Tag: accepted/tizen/common/20160615.193312~1^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=84b01b50e9f7db730d47e207b758843a9b1909f7;p=platform%2Fcore%2Fmultimedia%2Flibmm-wfd.git update %{TZ_SYS_RO_ETC} to %{_sysconf} because of install directory moving Change-Id: Ia5e448ab58d9c9c40de2c7e3046bc0a656c68593 Signed-off-by: Hyunsoo, Park --- diff --git a/common/include/mm_wfd_sink_ini.h b/common/include/mm_wfd_sink_ini.h index 0c5e8fc..73da585 100755 --- a/common/include/mm_wfd_sink_ini.h +++ b/common/include/mm_wfd_sink_ini.h @@ -41,7 +41,7 @@ enum WFDSinkINIProbeFlags WFD_SINK_INI_PROBE_BUFFER_DURATION = (1 << 3), }; -#define MM_WFD_SINK_INI_DEFAULT_PATH tzplatform_mkpath(TZ_SYS_RO_ETC, "/multimedia/mmfw_wfd_sink.ini") +#define MM_WFD_SINK_INI_DEFAULT_PATH SYSCONFDIR"/multimedia/mmfw_wfd_sink.ini" #define WFD_SINK_INI_MAX_STRLEN 256 #define WFD_SINK_INI_MAX_ELEMENT 10 diff --git a/config/Makefile.am b/config/Makefile.am index bface61..eb1a3b9 100755 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -1,2 +1,2 @@ -installconfiguredir=$(TZ_SYS_RO_ETC)/multimedia +installconfiguredir=$(_sysconfdir)/multimedia installconfigure_DATA=mmfw_wfd_sink.ini diff --git a/packaging/libmm-wfd.spec b/packaging/libmm-wfd.spec index 367ef2e..76df561 100755 --- a/packaging/libmm-wfd.spec +++ b/packaging/libmm-wfd.spec @@ -46,7 +46,7 @@ Requires: %{name} = %{version}-%{release} export CFLAGS+=" -Wextra -Wno-array-bounds" export CFLAGS+=" -Wno-ignored-qualifiers -Wno-unused-parameter -Wshadow" export CFLAGS+=" -Wwrite-strings -Wswitch-default" - +export CFLAGS+=" -DSYSCONFDIR=\\\"%{_sysconfdir}\\\"" ./autogen.sh CFLAGS+=" -DMMFW_DEBUG_MODE -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" "; export CFLAGS @@ -66,8 +66,8 @@ mkdir -p %{buildroot}/%{TZ_SYS_RO_SHARE}/dbus-1/services/ mkdir -p %{buildroot}/%{_datadir}/license cp -rf %{_builddir}/%{name}-%{version}/LICENSE.APLv2.0 %{buildroot}%{_datadir}/license/%{name} -mkdir -p %{buildroot}/%{TZ_SYS_RO_ETC}/multimedia -cp -rf config/mmfw_wfd_sink.ini %{buildroot}/%{TZ_SYS_RO_ETC}/multimedia/mmfw_wfd_sink.ini +mkdir -p %{buildroot}%{_sysconfdir}/multimedia +cp -rf config/mmfw_wfd_sink.ini %{buildroot}%{_sysconfdir}/multimedia/mmfw_wfd_sink.ini %clean rm -rf %{buildroot} @@ -81,7 +81,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %{_datadir}/license/%{name} -%{TZ_SYS_RO_ETC}/multimedia/mmfw_wfd_sink.ini +%{_sysconfdir}/multimedia/mmfw_wfd_sink.ini %{_libdir}/*.so.* %manifest libmm-wfd.manifest