From 41b0a295aa2d48eb693f312aed69e1183ca34fac Mon Sep 17 00:00:00 2001 From: WonYoung Choi Date: Thu, 15 Dec 2016 14:35:52 +0900 Subject: [PATCH] Fix dotnet_assembly_path in macros.dotnet-build-tools Change-Id: If972309cc3f9fbd09146319553cf66f0290853ca --- packaging/macros.dotnet-build-tools | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packaging/macros.dotnet-build-tools b/packaging/macros.dotnet-build-tools index 7f65b18..1c9ba8a 100644 --- a/packaging/macros.dotnet-build-tools +++ b/packaging/macros.dotnet-build-tools @@ -2,12 +2,12 @@ %_dotnet_build_conf %{lua:if tonumber(rpm.expand("0%{?tizen_build_devel_mode}")) == 1 then print "Debug" else print "Release" end} -%dotnet_assembly_path %{!?dotnet_assembly_path:/opt/usr/share/dotnet.tizen/framework} +%_dotnet_assembly_path %{?dotnet_assembly_path:%{dotnet_assembly_path}}%{!?dotnet_assembly_path:/opt/usr/share/dotnet.tizen/framework} %_mono_assembly_path /opt/usr/lib/assembly -%dotnet_assembly_files %{dotnet_assembly_path}/*.dll +%dotnet_assembly_files %{_dotnet_assembly_path}/*.dll -%_with_corefx 1 +%_with_corefx 1 %_nuget_package \ %package nuget\ @@ -47,12 +47,12 @@ nuget pack %{1}/%{1}.nuspec -Version %{?2}%{!?2:%{version}} -Properties Configur %dotnet_install() \ %if 0%{?_with_corefx} \ -mkdir -p %{buildroot}%{dotnet_assembly_path} \ +mkdir -p %{buildroot}%{_dotnet_assembly_path} \ mkdir -p %{buildroot}%{_mono_assembly_path} \ mkdir -p %{buildroot}/nuget \ -install -p -m 644 %{1}/bin/%{_dotnet_build_conf}/%{1}.dll %{buildroot}%{dotnet_assembly_path} \ +install -p -m 644 %{1}/bin/%{_dotnet_build_conf}/%{1}.dll %{buildroot}%{_dotnet_assembly_path} \ %else \ - install -p -m 644 %{1}/bin/%{_dotnet_build_conf}/Net45/%{1}.dll %{buildroot}%{dotnet_assembly_path} \ + install -p -m 644 %{1}/bin/%{_dotnet_build_conf}/Net45/%{1}.dll %{buildroot}%{_dotnet_assembly_path} \ %endif \ install -p -m 644 %{1}/bin/%{_dotnet_build_conf}/Net45/%{1}.dll %{buildroot}%{_mono_assembly_path} \ install -p -m 644 %{1}*.nupkg %{buildroot}/nuget \ -- 2.7.4