From 275c25d7a19aa3a64b111e0e69563cc2bb8cb8ea Mon Sep 17 00:00:00 2001 From: Björn Esser Date: Jan 12 2019 20:00:08 +0000 Subject: Use %%make_build and %%make_install macros --- diff --git a/gambas3.spec b/gambas3.spec index be66973..57fb95b 100644 --- a/gambas3.spec +++ b/gambas3.spec @@ -894,6 +894,7 @@ chmod -x main/lib/option/main.c # Gambas can't deal with -Wp,-D_FORTIFY_SOURCE=2 MY_CFLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g'` %configure \ + --disable-silent-rules \ --datadir="%{_datadir}" \ --enable-intl \ --enable-conv \ @@ -947,16 +948,14 @@ for i in main; do sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' $i/libtool done # for some unholy reason, using system libtool breaks on qt5. so we don't. -pushd gb.qt5 -%{__make} %{?_smp_mflags} V=1 -popd -%{__make} %{?_smp_mflags} V=1 +%make_build -C gb.qt5 +%make_build %install export PATH=%{buildroot}%{_bindir}:$PATH -make DESTDIR=%{buildroot} INSTALL="install -p" install +%make_install # Why do we have to run this twice? I HAVE NO IDEA. -make DESTDIR=%{buildroot} INSTALL="install -p" install +%make_install mkdir -p %{buildroot}%{_datadir}/pixmaps mkdir -p %{buildroot}%{_datadir}/applications @@ -1532,6 +1531,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : - Install COPYING using %%license - Remove unused patches from repo - Drop unneeded Group tag +- Use %%make_build and %%make_install macros * Thu Aug 23 2018 Nicolas Chauvet - 3.11.4-2 - Rebuilt for glew 2.1.0