[mingw-qt5-qtbase] Make sure $RPM_BUILD_ROOT is used

Erik van Pienbroek epienbro at fedoraproject.org
Mon Jan 28 10:34:31 UTC 2013


commit d87f64568985e16b4819b6d2f5cc3a83bda33198
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Mon Jan 28 11:34:23 2013 +0100

    Make sure $RPM_BUILD_ROOT is used

 mingw-qt5-qtbase.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/mingw-qt5-qtbase.spec b/mingw-qt5-qtbase.spec
index 6664f2b..d0fed73 100644
--- a/mingw-qt5-qtbase.spec
+++ b/mingw-qt5-qtbase.spec
@@ -340,8 +340,8 @@ make install -C ../build_release_static_win64$BUILDDIR INSTALL_ROOT=$RPM_BUILD_R
 # win32/win64 libraries mixed up. %%{_libdir} isn't desired for this as this can potentially
 # conflict with the native Qt5 package, so use a different folder
 mkdir $RPM_BUILD_ROOT%{_prefix}/%{mingw32_target}/lib/ $RPM_BUILD_ROOT%{_prefix}/%{mingw64_target}/lib/
-mv $RPM_BUILD_ROOT%{mingw32_libdir}/libQt5Bootstrap.a %{_prefix}/%{mingw32_target}/lib/
-mv $RPM_BUILD_ROOT%{mingw32_libdir}/libQt5Bootstrap.a %{_prefix}/%{mingw64_target}/lib/
+mv $RPM_BUILD_ROOT%{mingw32_libdir}/libQt5Bootstrap.a $RPM_BUILD_ROOT%{_prefix}/%{mingw32_target}/lib/
+mv $RPM_BUILD_ROOT%{mingw32_libdir}/libQt5Bootstrap.a $RPM_BUILD_ROOT%{_prefix}/%{mingw64_target}/lib/
 
 # Make sure other qmake projects can find the Qt5Bootstrap library
 echo "QMAKE_LFLAGS += -L%{_prefix}/%{mingw32_target}/lib" >> $RPM_BUILD_ROOT%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_bootstrap.pri


More information about the scm-commits mailing list