diff --git a/mingw64-runtime.spec b/mingw64-runtime.spec index f83148d..1d54353 100644 --- a/mingw64-runtime.spec +++ b/mingw64-runtime.spec @@ -44,13 +44,15 @@ make %install rm -rf $RPM_BUILD_ROOT +# The make install installs in /usr/x86_64-pc-mingw64/sys-root/x86_64-pc-mingw64/lib +# which is the wrong location. Move it to %{_mingw64_libdir}. +mkdir -p $RPM_BUILD_ROOT%{_mingw64_libdir} +mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{_mingw64_target} +ln -s $RPM_BUILD_ROOT%{_mingw64_libdir} $RPM_BUILD_ROOT%{_prefix}/%{_mingw64_target}/lib + make DESTDIR=$RPM_BUILD_ROOT install -# The above installs in /usr/x86_64-pc-mingw64/sys-root/x86_64-pc-mingw64/lib -# which is the wrong location. Move it to %{_mingw64_libdir}. -mkdir -p $RPM_BUILD_ROOT%{_mingw64_libdir} -mv $RPM_BUILD_ROOT%{_prefix}/%{_mingw64_target}/lib/* \ - $RPM_BUILD_ROOT%{_mingw64_libdir} +rm -f $RPM_BUILD_ROOT%{_prefix}/%{_mingw64_target}/lib %clean rm -rf $RPM_BUILD_ROOT