17 files changed, 94 insertions, 70 deletions
diff --git a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-binutils/arm-linux-gnueabi-binutils.spec b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-binutils/arm-linux-gnueabi-binutils.spec
index e727254..e34f227 100644
--- a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-binutils/arm-linux-gnueabi-binutils.spec
+++ b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-binutils/arm-linux-gnueabi-binutils.spec
@@ -44,11 +44,11 @@ Requires:   %{cross_triplet}-filesystem
     --disable-werror \
     --with-sysroot=%{cross_sysroot} \
 
-make %{?_smp_mflags}
+%make_build
 
 
 %install
-make install DESTDIR=%{buildroot}
+%make_install
 rm -rf %{buildroot}%{_mandir}
 rm -rf %{buildroot}%{_infodir}
 
@@ -90,7 +90,7 @@ rm -rf %{buildroot}%{_infodir}
 
 %changelog
 * Mon Dec 11 2017 Ting-Wei Lan <lantw44@gmail.com> - 2.29.1-3
-- Use autosetup macro
+- Use autosetup, make_build, make_install macros
 - Replace define with global
 
 * Thu Dec 07 2017 Ting-Wei Lan <lantw44@gmail.com> - 2.29.1-2
diff --git a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/arm-linux-gnueabi-gcc.spec b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/arm-linux-gnueabi-gcc.spec
index edbee6d..e9584c6 100644
--- a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/arm-linux-gnueabi-gcc.spec
+++ b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/arm-linux-gnueabi-gcc.spec
@@ -79,23 +79,29 @@ Provides:   %{cross_triplet}-gcc-stage3 = %{version}
 %build
 mkdir -p %{_builddir}/gcc-build
 cd %{_builddir}/gcc-build
-AR_FOR_TARGET=%{_bindir}/%{cross_triplet}-ar \
-AS_FOR_TARGET=%{_bindir}/%{cross_triplet}-as \
-DLLTOOL_FOR_TARGET=%{_bindir}/%{cross_triplet}-dlltool \
-LD_FOR_TARGET=%{_bindir}/%{cross_triplet}-ld \
-NM_FOR_TARGET=%{_bindir}/%{cross_triplet}-nm \
-OBJDUMP_FOR_TARGET=%{_bindir}/%{cross_triplet}-objdump \
-RANLIB_FOR_TARGET=%{_bindir}/%{cross_triplet}-ranlib \
-STRIP_FOR_TARGET=%{_bindir}/%{cross_triplet}-strip \
-WINDRES_FOR_TARGET=%{_bindir}/%{cross_triplet}-windres \
-WINDMC_FOR_TARGET=%{_bindir}/%{cross_triplet}-windmc \
-../gcc-%{version}/configure \
-    --prefix=%{_prefix} \
-    --mandir=%{_mandir} \
-    --infodir=%{_infodir} \
-    --host=%{_target_platform} \
-    --build=%{_target_platform} \
+export AR_FOR_TARGET=%{_bindir}/%{cross_triplet}-ar
+export AS_FOR_TARGET=%{_bindir}/%{cross_triplet}-as
+export DLLTOOL_FOR_TARGET=%{_bindir}/%{cross_triplet}-dlltool
+export LD_FOR_TARGET=%{_bindir}/%{cross_triplet}-ld
+export NM_FOR_TARGET=%{_bindir}/%{cross_triplet}-nm
+export OBJDUMP_FOR_TARGET=%{_bindir}/%{cross_triplet}-objdump
+export RANLIB_FOR_TARGET=%{_bindir}/%{cross_triplet}-ranlib
+export STRIP_FOR_TARGET=%{_bindir}/%{cross_triplet}-strip
+export WINDRES_FOR_TARGET=%{_bindir}/%{cross_triplet}-windres
+export WINDMC_FOR_TARGET=%{_bindir}/%{cross_triplet}-windmc
+%global _configure ../gcc-%{version}/configure
+%global _program_prefix %{cross_triplet}-
+%global __global_ldflags \\\
+    %(echo "%{__global_ldflags}" | sed 's/-specs=[^ ]*//g')
+%global optflags \\\
+    %(echo "%{optflags}" | \\\
+        sed -e 's/-m[^ ]*//g' -e 's/-specs=[^ ]*//g' -e 's/-Werror=[^ ]*//g')
+# GCC doesn't build without dependency tracking
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55930
+%configure \
+    --libdir=%{_prefix}/lib \
     --target=%{cross_triplet} \
+    --enable-dependency-tracking \
     --with-local-prefix=%{cross_sysroot} \
     --with-sysroot=%{cross_sysroot} \
     --with-gcc-major-version-only \
@@ -126,7 +132,7 @@ WINDMC_FOR_TARGET=%{_bindir}/%{cross_triplet}-windmc \
     --disable-threads \
     --disable-libmudflap \
 
-make %{?_smp_mflags} all-gcc
+%make_build all-gcc
 %endif
 %if %{cross_stage} == "pass2"
     --enable-languages=c \
@@ -134,7 +140,7 @@ make %{?_smp_mflags} all-gcc
     --disable-libgomp \
     --disable-libmudflap \
 
-make %{?_smp_mflags} all-gcc all-target-libgcc
+%make_build all-gcc all-target-libgcc
 %endif
 %if %{cross_stage} == "final"
 %if %{with ada}
@@ -155,7 +161,7 @@ make %{?_smp_mflags} all-gcc all-target-libgcc
     --enable-plugin \
     --enable-threads=posix \
 
-make %{?_smp_mflags}
+%make_build
 %endif
 
 
@@ -163,17 +169,17 @@ make %{?_smp_mflags}
 cd %{_builddir}/gcc-build
 
 %if %{cross_stage} == "pass1"
-make install-gcc DESTDIR=%{buildroot}
+%{__make} install-gcc DESTDIR=%{buildroot}
 %endif
 %if %{cross_stage} == "pass2"
-make install-gcc install-target-libgcc DESTDIR=%{buildroot}
+%{__make} install-gcc install-target-libgcc DESTDIR=%{buildroot}
 mkdir -p %{buildroot}%{cross_sysroot}/%{lib_dir_name}
 mv %{buildroot}%{_prefix}/%{cross_triplet}/%{lib_dir_name}/* \
     %{buildroot}%{cross_sysroot}/%{lib_dir_name}
 rmdir %{buildroot}%{_prefix}/%{cross_triplet}/%{lib_dir_name}
 %endif
 %if %{cross_stage} == "final"
-make install DESTDIR=%{buildroot}
+%make_install
 mkdir -p %{buildroot}%{cross_sysroot}/%{lib_dir_name}
 mv %{buildroot}%{_prefix}/%{cross_triplet}/%{lib_dir_name}/* \
     %{buildroot}%{cross_sysroot}/%{lib_dir_name}
@@ -356,6 +362,7 @@ chmod +x %{__ar_no_strip}
 
 %changelog
 * Mon Dec 11 2017 Ting-Wei Lan <lantw44@gmail.com> - 7.2.0-4
+- Use configure, make_build, make_install macros
 - Replace define with global
 
 * Thu Dec 07 2017 Ting-Wei Lan <lantw44@gmail.com> - 7.2.0-3
diff --git a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-glibc/arm-linux-gnueabi-glibc.spec b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-glibc/arm-linux-gnueabi-glibc.spec
index e095a8d..4e7a2d0 100644
--- a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-glibc/arm-linux-gnueabi-glibc.spec
+++ b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-glibc/arm-linux-gnueabi-glibc.spec
@@ -80,13 +80,21 @@ BuildRequires: %{cross_triplet}-gcc-stage2, perl
 %build
 mkdir -p %{_builddir}/glibc-build
 cd %{_builddir}/glibc-build
-BUILD_CC=%{_bindir}/gcc \
-CC=%{_bindir}/%{cross_triplet}-gcc \
-CXX=%{_bindir}/%{cross_triplet}-g++ \
-AR=%{_bindir}/%{cross_triplet}-ar \
-RANLIB=%{_bindir}/%{cross_triplet}-ranlib \
-../glibc-%{version}/configure \
-    --prefix=/usr \
+export BUILD_CC=%{_bindir}/gcc
+export CC=%{_bindir}/%{cross_triplet}-gcc
+export CXX=%{_bindir}/%{cross_triplet}-g++
+export AR=%{_bindir}/%{cross_triplet}-ar
+export RANLIB=%{_bindir}/%{cross_triplet}-ranlib
+%global _configure ../glibc-%{version}/configure
+%global __global_ldflags \\\
+    %(echo "%{__global_ldflags}" | sed 's/-specs=[^ ]*//g')
+%global optflags \\\
+    %(echo "%{optflags}" | \\\
+        sed -e 's/-m[^ ]*//g' -e 's/-specs=[^ ]*//g' -e 's/-Werror=[^ ]*//g' \\\
+            -e 's/-Wp,[^ ]*//g' -e 's/-fasynchronous-unwind-tables *//g')
+# Use /usr directly because it is the path in cross_sysroot
+%configure \
+    --libdir=/usr/%{lib_dir_name} \
     --host=%{cross_triplet} \
     --build=%{_target_platform} \
     --enable-kernel=2.6.32 \
@@ -109,16 +117,16 @@ RANLIB=%{_bindir}/%{cross_triplet}-ranlib \
 %endif
 
 %if %{headers_only}
-make %{?_smp_mflags} csu/subdir_lib
+%make_build csu/subdir_lib
 %else
-make %{?_smp_mflags}
+%make_build
 %endif
 
 
 %install
 cd %{_builddir}/glibc-build
 %if %{headers_only}
-make install-headers install_root=%{buildroot}%{cross_sysroot} \
+%{__make} install-headers install_root=%{buildroot}%{cross_sysroot} \
     install-bootstrap-headers=yes
 touch %{buildroot}%{cross_sysroot}/usr/include/gnu/stubs.h
 mkdir -p %{buildroot}%{cross_sysroot}/usr/%{lib_dir_name}
@@ -127,7 +135,7 @@ cp csu/crt1.o csu/crti.o csu/crtn.o \
 %{cross_triplet}-gcc -nostdlib -nostartfiles -shared -x c /dev/null \
     -o %{buildroot}%{cross_sysroot}/usr/%{lib_dir_name}/libc.so
 %else
-make install install_root=%{buildroot}%{cross_sysroot}
+%{__make} install install_root=%{buildroot}%{cross_sysroot}
 rm -rf %{buildroot}%{cross_sysroot}/usr/share/man
 rm -rf %{buildroot}%{cross_sysroot}/usr/share/info
 rm -rf %{buildroot}%{cross_sysroot}/usr/share/locale
@@ -579,6 +587,7 @@ chmod +x %{__ar_no_strip}
 
 %changelog
 * Mon Dec 11 2017 Ting-Wei Lan <lantw44@gmail.com> - 2.26-5
+- Use configure and make_build macros
 - Replace define with global
 
 * Thu Dec 07 2017 Ting-Wei Lan <lantw44@gmail.com> - 2.26-4
diff --git a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-kernel-headers/arm-linux-gnueabi-kernel-headers.spec b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-kernel-headers/arm-linux-gnueabi-kernel-headers.spec
index ab79952..44f1af9 100644
--- a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-kernel-headers/arm-linux-gnueabi-kernel-headers.spec
+++ b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-kernel-headers/arm-linux-gnueabi-kernel-headers.spec
@@ -27,13 +27,13 @@ Requires:   %{cross_triplet}-filesystem
 
 
 %build
-make ARCH=%{cross_arch} mrproper
-make ARCH=%{cross_arch} headers_check
+%{__make} ARCH=%{cross_arch} mrproper
+%{__make} ARCH=%{cross_arch} headers_check
 
 
 %install
 install -d %{buildroot}%{cross_sysroot}
-make headers_install ARCH=%{cross_arch} \
+%{__make} headers_install ARCH=%{cross_arch} \
     INSTALL_HDR_PATH=%{buildroot}%{cross_sysroot}/usr
 find %{buildroot}%{cross_sysroot} -name .install -delete
 find %{buildroot}%{cross_sysroot} -name ..install.cmd -delete
diff --git a/factor/msieve/msieve.spec b/factor/msieve/msieve.spec
index 68cc406..776b539 100644
--- a/factor/msieve/msieve.spec
+++ b/factor/msieve/msieve.spec
@@ -22,7 +22,7 @@ latter has helped complete some of the largest public factorizations known.
 
 %build
 sed -i 's|-march=native||' Makefile
-make %{?_smp_mflags} all ECM=1 CC="gcc %{optflags} %{__global_ldflags}"
+%make_build all ECM=1 CC="gcc %{optflags} %{__global_ldflags}"
 
 
 %install
@@ -41,7 +41,7 @@ install -m 644 libmsieve.a %{buildroot}%{_libdir}
 
 %changelog
 * Mon Dec 11 2017 Ting-Wei Lan <lantw44@gmail.com> - 1.53-4
-- Use autosetup macro
+- Use autosetup and make_build macros
 
 * Mon Oct 16 2017 Ting-Wei Lan <lantw44@gmail.com> - 1.53-3
 - Rebuilt for Fedora 27 and 28
diff --git a/factor/yafu/yafu.spec b/factor/yafu/yafu.spec
index 6f9386b..1c2c7af 100644
--- a/factor/yafu/yafu.spec
+++ b/factor/yafu/yafu.spec
@@ -28,7 +28,7 @@ utilize multi- or many-core processors (including SNFS, GNFS, SIQS, and ECM).
 sed -i 's|-lmsieve|-lmsieve -lz|' Makefile
 
 %ifarch x86_64
-make %{?_smp_mflags} x86_64 NFS=1 USE_SSE41=1 CC="gcc %{optflags} %{__global_ldflags}"
+%make_build x86_64 NFS=1 USE_SSE41=1 CC="gcc %{optflags} %{__global_ldflags}"
 %else
 false
 %endif
@@ -47,7 +47,7 @@ install -m 755 yafu %{buildroot}%{_bindir}
 
 %changelog
 * Mon Dec 11 2017 Ting-Wei Lan <lantw44@gmail.com> - 1.34-11
-- Use autosetup macro
+- Use autosetup and make_build macros
 
 * Mon Oct 16 2017 Ting-Wei Lan <lantw44@gmail.com> - 1.34-10
 - Rebuilt for Fedora 27 and 28
diff --git a/guix/emacs-geiser/emacs-geiser.spec b/guix/emacs-geiser/emacs-geiser.spec
index 9d20099..cfe1afa 100644
--- a/guix/emacs-geiser/emacs-geiser.spec
+++ b/guix/emacs-geiser/emacs-geiser.spec
@@ -32,11 +32,11 @@ keep the Lisp Machine Spirit alive.
 
 %build
 %configure --with-lispdir=%{_emacs_sitelispdir}/geiser
-make %{?_smp_mflags}
+%make_build
 
 
 %install
-make install DESTDIR=%{buildroot}
+%make_install
 mkdir -p %{buildroot}%{_datadir}/guile/site
 ln -s %{_datadir}/geiser/guile/geiser %{buildroot}%{_datadir}/guile/site/geiser
 
@@ -69,7 +69,7 @@ fi
 
 %changelog
 * Mon Dec 11 2017 Ting-Wei Lan <lantw44@gmail.com> - 0.9-5
-- Use autosetup macro
+- Use autosetup, make_build, make_install macros
 
 * Sat Dec 09 2017 Ting-Wei Lan <lantw44@gmail.com> - 0.9-4
 - Use HTTPS to download the source
diff --git a/guix/emacs-guix/emacs-guix.spec b/guix/emacs-guix/emacs-guix.spec
index 642a0ca..9741cf1 100644
--- a/guix/emacs-guix/emacs-guix.spec
+++ b/guix/emacs-guix/emacs-guix.spec
@@ -49,7 +49,7 @@ available info about packages and to do many other things.
     --with-guile-site-ccache-dir=%{guile_ccache_dir} \
     GUILE=%{_bindir}/guile \
     GUILD=%{_bindir}/guild
-make %{?_smp_mflags}
+%make_build
 
 
 %install
@@ -96,7 +96,7 @@ fi
 
 %changelog
 * Mon Dec 11 2017 Ting-Wei Lan <lantw44@gmail.com> - 0.3.3-2
-- Use autosetup macro
+- Use autosetup and make_build macros
 
 * Mon Oct 16 2017 Ting-Wei Lan <lantw44@gmail.com> - 0.3.3-1
 - Update to 0.3.3
diff --git a/guix/emacs-magit/emacs-magit.spec b/guix/emacs-magit/emacs-magit.spec
index 63b9e9c..ea248c4 100644
--- a/guix/emacs-magit/emacs-magit.spec
+++ b/guix/emacs-magit/emacs-magit.spec
@@ -39,7 +39,7 @@ common operations convenient.
 %autosetup -n magit-%{version} -p1
 
 %build
-make \
+%make_build \
     MAKEINFO='makeinfo --no-split' \
     LOAD_PATH='-L %{emacs_lispdir}/dash -L %{emacs_lispdir}/with-editor -L %{_builddir}/magit-%{version}/lisp -L .'
 
@@ -82,7 +82,7 @@ fi
 
 %changelog
 * Mon Dec 11 2017 Ting-Wei Lan <lantw44@gmail.com> - 2.11.0-3
-- Use autosetup macro
+- Use autosetup and make_build macros
 - Replace define with global
 
 * Sat Dec 09 2017 Ting-Wei Lan <lantw44@gmail.com> - 2.11.0-2
diff --git a/guix/emacs-with-editor/emacs-with-editor.spec b/guix/emacs-with-editor/emacs-with-editor.spec
index d3b6f08..e98ec47 100644
--- a/guix/emacs-with-editor/emacs-with-editor.spec
+++ b/guix/emacs-with-editor/emacs-with-editor.spec
@@ -27,7 +27,7 @@ call home.
 
 
 %build
-make MAKEINFO='makeinfo --no-split' INSTALL_INFO='true' \
+%make_build MAKEINFO='makeinfo --no-split' INSTALL_INFO='true' \
     EFLAGS='-L %{_emacs_sitelispdir}/dash' all
 
 
@@ -63,7 +63,7 @@ fi
 
 %changelog
 * Mon Dec 11 2017 Ting-Wei Lan <lantw44@gmail.com> - 2.7.0-3
-- Use autosetup macro
+- Use autosetup and make_build macros
 - Rename the source tarball
 
 * Sat Dec 09 2017 Ting-Wei Lan <lantw44@gmail.com> - 2.7.0-2
diff --git a/guix/guile-git/guile-git.spec b/guix/guile-git/guile-git.spec
index 42c96a1..39bbed8 100644
--- a/guix/guile-git/guile-git.spec
+++ b/guix/guile-git/guile-git.spec
@@ -38,7 +38,7 @@ repositories of the Git version control system.
 %check
 # segfault on i686
 %ifnarch %{ix86}
-make %{?_smp_mflags} check
+%{__make} %{?_smp_mflags} check
 %endif
 
 
diff --git a/guix/guile-json/guile-json.spec b/guix/guile-json/guile-json.spec
index 3775233..8c77ae5 100644
--- a/guix/guile-json/guile-json.spec
+++ b/guix/guile-json/guile-json.spec
@@ -29,7 +29,7 @@ features:
 
 %build
 %configure
-make %{?_smp_mflags}
+%make_build
 
 
 %install
@@ -53,7 +53,7 @@ make %{?_smp_mflags}
 
 %changelog
 * Mon Dec 11 2017 Ting-Wei Lan <lantw44@gmail.com> - 0.6.0-5
-- Use autosetup macro
+- Use autosetup and make_build macros
 - Use HTTPS links in description
 
 * Sun Dec 10 2017 Ting-Wei Lan <lantw44@gmail.com> - 0.6.0-4
diff --git a/guix/guile-ssh/guile-ssh.spec b/guix/guile-ssh/guile-ssh.spec
index 3a5f8bb..26794c6 100644
--- a/guix/guile-ssh/guile-ssh.spec
+++ b/guix/guile-ssh/guile-ssh.spec
@@ -28,7 +28,7 @@ written in GNU Guile interpreter. It is built upon the libssh library.
 %build
 autoreconf -fi
 %configure --disable-rpath --disable-static
-make %{?_smp_mflags}
+%make_build
 
 
 %check
@@ -39,7 +39,7 @@ sed -i 's|session.scm||' tests/Makefile
 %endif
 # try a few more times before failing
 for i in {1..24}; do
-    make %{?_smp_mflags} check && exit 0
+    %{__make} %{?_smp_mflags} check && exit 0
 done
 exit 1
 
@@ -80,7 +80,7 @@ fi
 
 %changelog
 * Mon Dec 11 2017 Ting-Wei Lan <lantw44@gmail.com> - 0.11.2-3
-- Use autosetup macro
+- Use autosetup and make_build macros
 - Rename the source tarball
 
 * Mon Oct 16 2017 Ting-Wei Lan <lantw44@gmail.com> - 0.11.2-2
diff --git a/guix/guix/guix.spec b/guix/guix/guix.spec
index 34b4308..54b6079 100644
--- a/guix/guix/guix.spec
+++ b/guix/guix/guix.spec
@@ -3,7 +3,7 @@
 
 Name:           guix
 Version:        0.14.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A purely functional package manager for the GNU system
 
 License:        GPLv3+
@@ -89,14 +89,14 @@ if [ "$(id -u)" = "0" ]; then
         chown -R nobody:nobody %{_topdir}
         setfacl -m u:nobody:x /builddir
     fi
-    runuser nobody -s /bin/sh -c "make %{?_smp_mflags} check" && exit 0
+    runuser nobody -s /bin/sh -c "%{__make} %{?_smp_mflags} check" && exit 0
 else
-    make %{?_smp_mflags} check && exit 0
+    %{__make} %{?_smp_mflags} check && exit 0
 fi
 
 
 %install
-make install DESTDIR=%{buildroot} systemdservicedir=%{_unitdir}
+%make_install systemdservicedir=%{_unitdir}
 # rename systemd service files provided by upstream
 mv %{buildroot}%{_unitdir}/guix-daemon{,-latest}.service
 mv %{buildroot}%{_unitdir}/guix-publish{,-latest}.service
@@ -356,6 +356,9 @@ fi
 
 
 %changelog
+* Tue Dec 12 2017 Ting-Wei Lan <lantw44@gmail.com> - 0.14.0-5
+- Use make_install macro
+
 * Tue Dec 12 2017 Ting-Wei Lan <lantw44@gmail.com> - 0.14.0-4
 - Fix TLS crash with upstream commit 7f04197
 
diff --git a/lilyterm-gtk3/lilyterm-gtk3/lilyterm-gtk3.spec b/lilyterm-gtk3/lilyterm-gtk3/lilyterm-gtk3.spec
index 4dab528..eeab803 100644
--- a/lilyterm-gtk3/lilyterm-gtk3/lilyterm-gtk3.spec
+++ b/lilyterm-gtk3/lilyterm-gtk3/lilyterm-gtk3.spec
@@ -3,7 +3,7 @@
 
 Name:           lilyterm-gtk3
 Version:        0.9.9.5
-Release:        0.11.20161004git%{shortcommit}%{?dist}
+Release:        0.12.20161004git%{shortcommit}%{?dist}
 Summary:        Light and easy to use X Terminal Emulator (Copr: lantw44/lilyterm-gtk3)
 
 Group:          User Interface/X
@@ -53,11 +53,11 @@ sed -i -e '/AUTHORS COPYING ChangeLog/,/COPYING/d' data/Makefile
 %build
 %configure --with-gtk=3.0
 echo "EXAMPLES_DIR = %{_pkgdocdir}/examples" >> .config
-make STRIP=:
+%make_build STRIP=:
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT STRIP=:
+%make_install STRIP=:
 sed -i -e 's/LilyTerm/LilyTermGtk3/' -e 's/lilyterm/lilyterm-gtk3/' \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 desktop-file-install                                       \
@@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 12 2017 Ting-Wei Lan <lantw44@gmail.com> - 0.9.9.5-0.12.20161004git8df92d6
+- Use make_build and make_install macros
+
 * Mon Oct 16 2017 Ting-Wei Lan <lantw44@gmail.com> - 0.9.9.5-0.11.20161004git8df92d6
 - Rebuilt for Fedora 27 and 28
 
diff --git a/qelly/qelly/qelly.spec b/qelly/qelly/qelly.spec
index 2f37ad7..53dead2 100644
--- a/qelly/qelly/qelly.spec
+++ b/qelly/qelly/qelly.spec
@@ -26,7 +26,7 @@ name), but more features from other Telnet/SSH clients are also planned.
 
 %build
 %{qmake_qt4}
-make %{?_smp_mflags}
+%make_build
 
 
 %install
@@ -42,7 +42,7 @@ install -m 755 "bin/Qelly" "%{buildroot}/usr/bin"
 
 %changelog
 * Mon Dec 11 2017 Ting-Wei Lan <lantw44@gmail.com> - 1.0-0.10.beta
-- Use autosetup macro
+- Use autosetup and make_build macros
 - Rename the source tarball
 
 * Mon Oct 16 2017 Ting-Wei Lan <lantw44@gmail.com> - 1.0-0.9.beta
diff --git a/tcc/tcc/tcc.spec b/tcc/tcc/tcc.spec
index 8e340cf..efdfc3c 100644
--- a/tcc/tcc/tcc.spec
+++ b/tcc/tcc/tcc.spec
@@ -30,9 +30,11 @@ It can also run C source code as a script.
 %autosetup -n %{pkg_name}-%{version} -p1
 
 %build
+# We cannot use configure macro here because it will pass unsupported compiler
+# flags to tcc. These flags are passed to gcc with make command line instead.
 ./configure --prefix=%{_prefix} --libdir=%{_libdir} \
             --cc=%{use_cc} --enable-cross
-make %{?_smp_mflags} \
+%make_build \
 %ifarch x86_64 amd64
 %if %{use_gcc}
     CC="gcc %{optflags} %{__global_ldflags}"
@@ -40,7 +42,7 @@ make %{?_smp_mflags} \
 %endif
 
 %install
-make install DESTDIR=%{buildroot}
+%make_install
 rm -f %{buildroot}%{_datadir}/doc/tcc/tcc-doc.html
 
 %post
@@ -102,7 +104,7 @@ fi
 
 %changelog
 * Mon Dec 11 2017 Ting-Wei Lan <lantw44@gmail.com> - 0.9.26-14
-- Use autosetup macro
+- Use autosetup, make_build, make_install macros
 - Use HTTPS to download the source
 
 * Mon Oct 16 2017 Ting-Wei Lan <lantw44@gmail.com> - 0.9.26-13