From 5209078684ceda111328c2caac6d9f12f365668b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Sat, 2 Jul 2022 20:39:19 +0100
Subject: [PATCH 1/2] Switch to unversioned autoconf.

Remove unversioned autoconf symlink from all but the latest autoconf.

This makes it clearer which autoconf is used.
---
 sysa/SHA256SUMS.pkgs                          | 20 +++++++++----------
 sysa/autoconf-2.54/autoconf-2.54.sh           |  2 --
 sysa/autoconf-2.55/autoconf-2.55.sh           |  7 +------
 sysa/autoconf-2.57/autoconf-2.57.sh           |  7 +------
 sysa/autoconf-2.59/autoconf-2.59.sh           |  7 +------
 sysa/autoconf-2.61/autoconf-2.61.sh           |  7 +------
 sysa/autoconf-2.64/autoconf-2.64.sh           |  7 +------
 sysa/automake-1.10.3/automake-1.10.3.sh       |  9 +++++----
 sysa/automake-1.7.8/automake-1.7.8.sh         |  4 ++--
 sysa/automake-1.8.5/automake-1.8.5.sh         |  4 ++--
 sysa/automake-1.9.6/automake-1.9.6.sh         |  4 ++--
 sysa/curl-7.83.0/curl-7.83.0.sh               |  2 +-
 sysa/e2fsprogs-1.45.7/e2fsprogs-1.45.7.sh     |  2 +-
 sysa/findutils-4.2.33/findutils-4.2.33.sh     |  2 +-
 sysa/gcc-4.0.4/pass1.sh                       |  2 +-
 sysa/gcc-4.0.4/pass2.sh                       |  2 +-
 sysa/kbd-1.15/kbd-1.15.sh                     |  2 +-
 sysa/kexec-tools-2.0.22/kexec-tools-2.0.22.sh |  2 +-
 sysa/libtool-2.2.4/libtool-2.2.4.sh           |  4 ++--
 sysa/make-3.82/make-3.82.sh                   |  2 +-
 sysa/util-linux-2.19.1/util-linux-2.19.1.sh   |  2 +-
 sysc/autoconf-2.69/autoconf-2.69.sh           |  5 -----
 sysc/automake-1.11.2/automake-1.11.2.sh       |  6 +++---
 sysc/automake-1.15.1/automake-1.15.1.sh       |  6 +++---
 sysc/automake-1.16.3/automake-1.16.3.sh       |  4 ++--
 sysc/bison-3.4.2/bison-3.4.2.sh               |  2 +-
 sysc/curl-7.83.0/curl-7.83.0.sh               |  2 +-
 sysc/flex-2.5.33/flex-2.5.33.sh               |  2 +-
 sysc/gmp-6.2.1/gmp-6.2.1.sh                   |  2 +-
 sysc/libarchive-3.5.2/libarchive-3.5.2.sh     |  2 +-
 sysc/make-4.2.1/make-4.2.1.sh                 |  2 +-
 sysc/pkg-config-0.29.2/pkg-config-0.29.2.sh   |  2 +-
 sysc/tar-1.34/tar-1.34.sh                     |  2 +-
 sysc/xz-5.0.5/xz-5.0.5.sh                     |  2 +-
 34 files changed, 54 insertions(+), 85 deletions(-)

diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs
index 0e65b361..c1bc46f4 100644
--- a/sysa/SHA256SUMS.pkgs
+++ b/sysa/SHA256SUMS.pkgs
@@ -3,19 +3,19 @@
 38f0de4c816088c514dbfb1536779f2204426a95bd6f57fa87b83bffefcaa390  autoconf-2.52_0.tar.bz2
 912dd3cc26c14eda0810758661892c53cdd715e2224893c4b467f210e9af0d4a  autoconf-2.52_1.tar.bz2
 44c8ffbcfb7afd82e079ca779a5e8812d93edcb44caf6db7cf5d5e999f04bab6  autoconf-2.53_0.tar.bz2
-dc6713f9e9ea9dfdccbf43dcb673505d965fd908f47cf60659a043008a13be4c  autoconf-2.54_0.tar.bz2
-28f7fa43c5154dd28f2a69e7c2c869eb96b771bfe545d68129284447f4239f28  autoconf-2.55_0.tar.bz2
-d277abf366bfaff1f4612a649ecf8afc7bd647e4766ad00fd5fb188e73386609  autoconf-2.57_0.tar.bz2
-acb67a181d8f345e011f29e1ae9f41ee2cf108e6d41ac54e62f1cd85f614c105  autoconf-2.59_0.tar.bz2
-d0575d1e705fb37b8b9e5772e9aa6f633b3cb825d005a20d410d750374fea288  autoconf-2.61_0.tar.bz2
-26335026820d9999c8147959205a0b184705630319427385d9140c13799bee99  autoconf-2.64_0.tar.bz2
-35c37852cc4eab1ff9a2a9fd924385fd12c89b1281aa84ff7b9cdca2ad3dbd36  autoconf-2.69_0.tar.bz2
+b4ac026701baaefbf1bcd923fbe58f734714e794977af8b3f2006ba9d75c7492  autoconf-2.54_0.tar.bz2
+2aec71fb4cd8a65b531d5ab0cc7fd299e479b2bc83d627f27271d4c5fc51ce5e  autoconf-2.55_0.tar.bz2
+cbc432ed535d2d1d7ed3f4ccc2b1fd13b41ae1c821f70d6710db2d8c7a04b646  autoconf-2.57_0.tar.bz2
+b6e5ee431382e64b1465c5ba14d3feee847c2574b6ce3a0cb1d3d4be22457017  autoconf-2.59_0.tar.bz2
+096276278309959cea467ecc3da92f004203065f90b6f73e389d6d6757440f7c  autoconf-2.61_0.tar.bz2
+d5fcce4baea5e11f983a7e4b7148545ab6720bb4e010898c73387f6711be67f4  autoconf-2.64_0.tar.bz2
+298dcf17a439adb306237b308e3c4ed3d376cb863ae0f0f08bfdf1f3199a548b  autoconf-2.69_0.tar.bz2
 d713ac1840e82250414ee4f7cd75c79ee44ecb4e8dfc659704eed3d75e7d348c  autoconf-2.71_0.x86.xbps
 6ff691e3ddd4f3d1796d28b07a2a96691dbd9801844c99ccbe660da59dabd74b  autoconf-archive-2021.02.19_0.tar.bz2
 cf6b7bbdba1a58b0cc1e6dae36a82e3b28db8ee1e948225d72530accee32aaab  automake-1.10.3_0.tar.bz2
-44817b7ef712d3a656b9bca48829fab57aa923b1c60a59462ae8f09d59f7f0d7  automake-1.11.2_0.tar.bz2
-834ea7db3f57bc44ed95afc98c249aab35603ae930434a45e012accfe78d2465  automake-1.15.1_0.tar.bz2
-5e89c375f738d9ec5320a110bd2904e63f4a1b6eea965b7efd4beb4d7716d4de  automake-1.16.3_0.x86.xbps
+778efda0ea7a85c49a8d4f2ceda7dca1eb3e77ef91e3cd4036302bb5e90a620f  automake-1.11.2_0.tar.bz2
+27cbc3f942fb386ad4fceb62188722dbd8a833082bc037e4f1688927a3df854d  automake-1.15.1_0.tar.bz2
+a9c66f944e0dbebb3661bb134795749a6f3ef69abb69d6080ac90446b8cfb5e7  automake-1.16.3_0.x86.xbps
 51ef85383c0afe88c17a25f8b49c4dfdd77c1cc6aa81568ec09d45a15d580de8  automake-1.4-p6_0.tar.bz2
 8ec3af09fd23256f89b27833a8311ed347caf93d611b1209232ce104bb6fb4ef  automake-1.6.3_0.tar.bz2
 031119cb14859c8bf80d5df5e0bbc475cf67f04b645dc55c80bcabe1bb31a8cd  automake-1.6.3_1.tar.bz2
diff --git a/sysa/autoconf-2.54/autoconf-2.54.sh b/sysa/autoconf-2.54/autoconf-2.54.sh
index 4cfec57b..bd30c542 100755
--- a/sysa/autoconf-2.54/autoconf-2.54.sh
+++ b/sysa/autoconf-2.54/autoconf-2.54.sh
@@ -38,6 +38,4 @@ src_compile() {
 
 src_install() {
     make install MAKEINFO=true DESTDIR="${DESTDIR}"
-
-    ln -sf "${PREFIX}"/bin/autoconf-2.54 "${DESTDIR}${PREFIX}"/bin/autoconf
 }
diff --git a/sysa/autoconf-2.55/autoconf-2.55.sh b/sysa/autoconf-2.55/autoconf-2.55.sh
index e2b70101..15cb0c00 100755
--- a/sysa/autoconf-2.55/autoconf-2.55.sh
+++ b/sysa/autoconf-2.55/autoconf-2.55.sh
@@ -10,7 +10,7 @@ src_prepare() {
     # Do not use pregenerated manpages
     sed -i '/SUBDIRS/s/ man//' Makefile.am
 
-    autoreconf-2.54
+    AUTOCONF=autoconf-2.54 autoreconf-2.54
 
     # Install autoconf data files into versioned directory
     for file in */*/Makefile.in */Makefile.in Makefile.in; do
@@ -32,9 +32,4 @@ src_compile() {
 
 src_install() {
     make install MAKEINFO=true DESTDIR="${DESTDIR}"
-
-    ln -sf "${PREFIX}/bin/autoconf-2.55" "${DESTDIR}${PREFIX}/bin/autoconf"
-    ln -sf "${PREFIX}/bin/autoheader-2.55" "${DESTDIR}${PREFIX}/bin/autoheader"
-    ln -sf "${PREFIX}/bin/autom4te-2.55" "${DESTDIR}${PREFIX}/bin/autom4te"
-    ln -sf "${PREFIX}/bin/autoreconf-2.55" "${DESTDIR}${PREFIX}/bin/autoreconf"
 }
diff --git a/sysa/autoconf-2.57/autoconf-2.57.sh b/sysa/autoconf-2.57/autoconf-2.57.sh
index 4b235ba0..f867aa2c 100755
--- a/sysa/autoconf-2.57/autoconf-2.57.sh
+++ b/sysa/autoconf-2.57/autoconf-2.57.sh
@@ -9,7 +9,7 @@ src_prepare() {
     # Do not use pregenerated manpages
     sed -i '/SUBDIRS/s/ man//' Makefile.am
 
-    autoreconf-2.55 -f
+    AUTOCONF=autoconf-2.55 autoreconf-2.55 -f
 
     # Install autoconf data files into versioned directory
     for file in */*/Makefile.in */Makefile.in Makefile.in; do
@@ -30,9 +30,4 @@ src_compile() {
 
 src_install() {
     make install MAKEINFO=true DESTDIR="${DESTDIR}"
-
-    ln -sf "${PREFIX}/bin/autoconf-2.57" "${DESTDIR}${PREFIX}/bin/autoconf"
-    ln -sf "${PREFIX}/bin/autoheader-2.57" "${DESTDIR}${PREFIX}/bin/autoheader"
-    ln -sf "${PREFIX}/bin/autom4te-2.57" "${DESTDIR}${PREFIX}/bin/autom4te"
-    ln -sf "${PREFIX}/bin/autoreconf-2.57" "${DESTDIR}${PREFIX}/bin/autoreconf"
 }
diff --git a/sysa/autoconf-2.59/autoconf-2.59.sh b/sysa/autoconf-2.59/autoconf-2.59.sh
index b5ed6f27..190e69d4 100755
--- a/sysa/autoconf-2.59/autoconf-2.59.sh
+++ b/sysa/autoconf-2.59/autoconf-2.59.sh
@@ -9,7 +9,7 @@ src_prepare() {
     # Do not use pregenerated manpages
     sed -i '/SUBDIRS/s/ man//' Makefile.am
 
-    autoreconf-2.57 -f
+    AUTOCONF=autoconf-2.57 autoreconf-2.57 -f
 
     # Install autoconf data files into versioned directory
     for file in */*/Makefile.in */Makefile.in Makefile.in; do
@@ -30,9 +30,4 @@ src_compile() {
 
 src_install() {
     make install MAKEINFO=true DESTDIR="${DESTDIR}"
-
-    ln -sf "${PREFIX}/bin/autoconf-2.59" "${DESTDIR}${PREFIX}/bin/autoconf"
-    ln -sf "${PREFIX}/bin/autoheader-2.59" "${DESTDIR}${PREFIX}/bin/autoheader"
-    ln -sf "${PREFIX}/bin/autom4te-2.59" "${DESTDIR}${PREFIX}/bin/autom4te"
-    ln -sf "${PREFIX}/bin/autoreconf-2.59" "${DESTDIR}${PREFIX}/bin/autoreconf"
 }
diff --git a/sysa/autoconf-2.61/autoconf-2.61.sh b/sysa/autoconf-2.61/autoconf-2.61.sh
index b50bdb6f..25220fa8 100755
--- a/sysa/autoconf-2.61/autoconf-2.61.sh
+++ b/sysa/autoconf-2.61/autoconf-2.61.sh
@@ -6,7 +6,7 @@ src_prepare() {
     rm doc/standards.info man/*.1
     sed -i -e '/AC_PROG_GREP/d' -e '/AC_PROG_SED/d' configure.ac
 
-    autoreconf-2.59 -f
+    AUTOM4TE=autom4te-2.59 AUTOCONF=autoconf-2.59 autoreconf-2.59 -f
 
     # Install autoconf data files into versioned directory
     for file in */*/Makefile.in */Makefile.in Makefile.in; do
@@ -24,9 +24,4 @@ src_compile() {
 
 src_install() {
     make install MAKEINFO=true DESTDIR="${DESTDIR}"
-
-    ln -sf "${PREFIX}/bin/autoconf-2.61" "${DESTDIR}${PREFIX}/bin/autoconf"
-    ln -sf "${PREFIX}/bin/autoheader-2.61" "${DESTDIR}${PREFIX}/bin/autoheader"
-    ln -sf "${PREFIX}/bin/autom4te-2.61" "${DESTDIR}${PREFIX}/bin/autom4te"
-    ln -sf "${PREFIX}/bin/autoreconf-2.61" "${DESTDIR}${PREFIX}/bin/autoreconf"
 }
diff --git a/sysa/autoconf-2.64/autoconf-2.64.sh b/sysa/autoconf-2.64/autoconf-2.64.sh
index a88b3fc5..ec316c09 100755
--- a/sysa/autoconf-2.64/autoconf-2.64.sh
+++ b/sysa/autoconf-2.64/autoconf-2.64.sh
@@ -5,7 +5,7 @@
 src_prepare() {
     rm doc/standards.info man/*.1
 
-    autoreconf-2.61 -f
+    AUTOM4TE=autom4te-2.61 AUTOCONF=autoconf-2.61 autoreconf-2.61 -f
 
     # Install autoconf data files into versioned directory
     for file in */*/Makefile.in */Makefile.in Makefile.in; do
@@ -23,9 +23,4 @@ src_compile() {
 
 src_install() {
     make install MAKEINFO=true DESTDIR="${DESTDIR}"
-
-    ln -sf "${PREFIX}/bin/autoconf-2.64" "${DESTDIR}${PREFIX}/bin/autoconf"
-    ln -sf "${PREFIX}/bin/autoheader-2.64" "${DESTDIR}${PREFIX}/bin/autoheader"
-    ln -sf "${PREFIX}/bin/autom4te-2.64" "${DESTDIR}${PREFIX}/bin/autom4te"
-    ln -sf "${PREFIX}/bin/autoreconf-2.64" "${DESTDIR}${PREFIX}/bin/autoreconf"
 }
diff --git a/sysa/automake-1.10.3/automake-1.10.3.sh b/sysa/automake-1.10.3/automake-1.10.3.sh
index 5098c622..ba8f8703 100755
--- a/sysa/automake-1.10.3/automake-1.10.3.sh
+++ b/sysa/automake-1.10.3/automake-1.10.3.sh
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
 # SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
@@ -8,15 +8,16 @@ src_prepare() {
 
     rm doc/amhello-1.0.tar.gz doc/automake.info*
 
-    ./bootstrap
+    sed -i 's/autoreconf/autoreconf-2.61/' doc/Makefile.am
+    AUTOM4TE=autom4te-2.61 AUTOCONF=autoconf-2.61 AUTOHEADER=autoheader-2.61 AUTORECONF=autoreconf-2.61 ./bootstrap
 }
 
 src_configure() {
-    ./configure CC=tcc --prefix="${PREFIX}"
+    AUTORECONF=autoreconf-2.61 AUTOHEADER=autoheader-2.61 AUTOCONF=autoconf-2.61 AUTOM4TE=autom4te-2.61 ./configure CC=tcc --prefix="${PREFIX}"
 }
 
 src_compile() {
-    make MAKEINFO=true CC=tcc
+    AUTOM4TE=autom4te-2.61 make MAKEINFO=true CC=tcc
 }
 
 src_install() {
diff --git a/sysa/automake-1.7.8/automake-1.7.8.sh b/sysa/automake-1.7.8/automake-1.7.8.sh
index ac46cef4..87fd32b6 100755
--- a/sysa/automake-1.7.8/automake-1.7.8.sh
+++ b/sysa/automake-1.7.8/automake-1.7.8.sh
@@ -5,11 +5,11 @@
 src_prepare() {
     rm -- configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info*
 
-    autoreconf-2.55
+    AUTOCONF=autoconf-2.55 autoreconf-2.55
 }
 
 src_configure() {
-    ./configure --prefix="${PREFIX}"
+    AUTOCONF=autoconf-2.55 ./configure --prefix="${PREFIX}"
 }
 
 src_compile() {
diff --git a/sysa/automake-1.8.5/automake-1.8.5.sh b/sysa/automake-1.8.5/automake-1.8.5.sh
index 6b2e6db0..87e7d9dc 100755
--- a/sysa/automake-1.8.5/automake-1.8.5.sh
+++ b/sysa/automake-1.8.5/automake-1.8.5.sh
@@ -5,11 +5,11 @@
 src_prepare() {
     rm doc/automake.info*
 
-    autoreconf-2.59 -f
+    AUTOCONF=autoconf-2.59 autoreconf-2.59 -f
 }
 
 src_configure() {
-    ./configure --prefix="${PREFIX}"
+    AUTOCONF=autoconf-2.59 ./configure --prefix="${PREFIX}"
 }
 
 src_compile() {
diff --git a/sysa/automake-1.9.6/automake-1.9.6.sh b/sysa/automake-1.9.6/automake-1.9.6.sh
index 6cbe415c..5083980a 100755
--- a/sysa/automake-1.9.6/automake-1.9.6.sh
+++ b/sysa/automake-1.9.6/automake-1.9.6.sh
@@ -6,11 +6,11 @@ src_prepare() {
     rm doc/automake.info*
 
     sed -i 's/1.8a/1.8.5/; s/ filename-length-max=99//' configure.ac
-    autoreconf-2.61 -f
+    AUTOM4TE=autom4te-2.61 AUTOCONF=autoconf-2.61 autoreconf-2.61 -f
 }
 
 src_configure() {
-    ./configure --prefix="${PREFIX}"
+    AUTOCONF=autoconf-2.61 ./configure --prefix="${PREFIX}"
 }
 
 src_compile() {
diff --git a/sysa/curl-7.83.0/curl-7.83.0.sh b/sysa/curl-7.83.0/curl-7.83.0.sh
index 88b46f69..73ba7eef 100755
--- a/sysa/curl-7.83.0/curl-7.83.0.sh
+++ b/sysa/curl-7.83.0/curl-7.83.0.sh
@@ -15,7 +15,7 @@ src_prepare() {
     rm config.guess config.sub ltmain.sh
     libtoolize
 
-    autoreconf -fi
+    AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi
 }
 
 src_configure() {
diff --git a/sysa/e2fsprogs-1.45.7/e2fsprogs-1.45.7.sh b/sysa/e2fsprogs-1.45.7/e2fsprogs-1.45.7.sh
index 3d3f9e5a..312446dd 100755
--- a/sysa/e2fsprogs-1.45.7/e2fsprogs-1.45.7.sh
+++ b/sysa/e2fsprogs-1.45.7/e2fsprogs-1.45.7.sh
@@ -16,7 +16,7 @@ src_prepare() {
     rm config/config.guess config/config.sub config/ltmain.sh
     libtoolize -i
 
-    autoreconf -fi
+    AUTOCONF=autoconf-2.64 AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi
 
     # Remove bison parser generated
     rm intl/plural.y
diff --git a/sysa/findutils-4.2.33/findutils-4.2.33.sh b/sysa/findutils-4.2.33/findutils-4.2.33.sh
index 00976e5d..0e32326e 100755
--- a/sysa/findutils-4.2.33/findutils-4.2.33.sh
+++ b/sysa/findutils-4.2.33/findutils-4.2.33.sh
@@ -10,7 +10,7 @@ src_prepare() {
 
     default
 
-    autoreconf-2.61 -f
+    AUTOM4TE=autom4te-2.61 AUTOCONF=autoconf-2.61 autoreconf-2.61 -f
 
     # Pre-built texinfo files
     rm doc/find.info
diff --git a/sysa/gcc-4.0.4/pass1.sh b/sysa/gcc-4.0.4/pass1.sh
index 1d97eaf1..46e6852e 100755
--- a/sysa/gcc-4.0.4/pass1.sh
+++ b/sysa/gcc-4.0.4/pass1.sh
@@ -20,7 +20,7 @@ src_prepare() {
     for dir in intl libcpp; do
         cd $dir
         rm aclocal.m4
-        aclocal-1.9 --acdir=../config
+        AUTOM4TE=autom4te-2.61 aclocal-1.9 --acdir=../config
         cd ..
     done
     for dir in fixincludes gcc intl libcpp libiberty; do
diff --git a/sysa/gcc-4.0.4/pass2.sh b/sysa/gcc-4.0.4/pass2.sh
index ff3140b0..dc564dc6 100755
--- a/sysa/gcc-4.0.4/pass2.sh
+++ b/sysa/gcc-4.0.4/pass2.sh
@@ -19,7 +19,7 @@ src_prepare() {
     for dir in intl libcpp; do
         cd $dir
         rm aclocal.m4
-        aclocal-1.9 --acdir=../config
+        AUTOM4TE=autom4te-2.61 aclocal-1.9 --acdir=../config
         cd ..
     done
     for dir in fixincludes gcc intl libcpp libiberty; do
diff --git a/sysa/kbd-1.15/kbd-1.15.sh b/sysa/kbd-1.15/kbd-1.15.sh
index 2024a6b5..dbc23df5 100755
--- a/sysa/kbd-1.15/kbd-1.15.sh
+++ b/sysa/kbd-1.15/kbd-1.15.sh
@@ -12,7 +12,7 @@ src_prepare() {
     sed -i -e 's/u_char/unsigned char/g' \
         -e 's/u_short/unsigned short/g' src/dumpkeys.c src/loadkeys.y
 
-    AUTOPOINT=true autoreconf -fi
+    AUTOPOINT=true AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi
 }
 
 src_configure() {
diff --git a/sysa/kexec-tools-2.0.22/kexec-tools-2.0.22.sh b/sysa/kexec-tools-2.0.22/kexec-tools-2.0.22.sh
index cfcad789..c903fe49 100755
--- a/sysa/kexec-tools-2.0.22/kexec-tools-2.0.22.sh
+++ b/sysa/kexec-tools-2.0.22/kexec-tools-2.0.22.sh
@@ -6,7 +6,7 @@
 src_prepare() {
     default
 
-    autoreconf -fi
+    AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi
 }
 
 src_configure() {
diff --git a/sysa/libtool-2.2.4/libtool-2.2.4.sh b/sysa/libtool-2.2.4/libtool-2.2.4.sh
index e7dc031e..49b72ff1 100755
--- a/sysa/libtool-2.2.4/libtool-2.2.4.sh
+++ b/sysa/libtool-2.2.4/libtool-2.2.4.sh
@@ -10,7 +10,7 @@ src_prepare() {
 
     rm -f doc/*.info
 
-    ./bootstrap
+    AUTOM4TE=autom4te-2.61 AUTOCONF=autoconf-2.61 AUTOHEADER=autoheader-2.61 AUTORECONF=autoreconf-2.61 ./bootstrap
 }
 
 src_configure() {
@@ -28,7 +28,7 @@ src_configure() {
 }
 
 src_compile() {
-    make MAKEINFO=true
+    make AUTOM4TE=autom4te-2.61 MAKEINFO=true
 }
 
 src_install() {
diff --git a/sysa/make-3.82/make-3.82.sh b/sysa/make-3.82/make-3.82.sh
index 5623a869..4721dd96 100755
--- a/sysa/make-3.82/make-3.82.sh
+++ b/sysa/make-3.82/make-3.82.sh
@@ -9,7 +9,7 @@ src_prepare() {
     touch doc/make.info
 
     # We don't have autopoint from gettext yet
-    AUTOPOINT=true autoreconf -fi
+    AUTOPOINT=true AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi
 }
 
 src_configure() {
diff --git a/sysa/util-linux-2.19.1/util-linux-2.19.1.sh b/sysa/util-linux-2.19.1/util-linux-2.19.1.sh
index 665a2a0f..42e91c88 100755
--- a/sysa/util-linux-2.19.1/util-linux-2.19.1.sh
+++ b/sysa/util-linux-2.19.1/util-linux-2.19.1.sh
@@ -6,7 +6,7 @@ src_prepare() {
     default
 
     # We don't have gettext (autopoint) yet.
-    AUTOPOINT=true autoreconf -fi
+    AUTOPOINT=true AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi
 }
 
 src_configure() {
diff --git a/sysc/autoconf-2.69/autoconf-2.69.sh b/sysc/autoconf-2.69/autoconf-2.69.sh
index 997017e0..c4589bb9 100755
--- a/sysc/autoconf-2.69/autoconf-2.69.sh
+++ b/sysc/autoconf-2.69/autoconf-2.69.sh
@@ -25,9 +25,4 @@ src_compile() {
 
 src_install() {
     make install MAKEINFO=true DESTDIR="${DESTDIR}"
-
-    ln -sf "${PREFIX}/bin/autoconf-2.69" "${DESTDIR}${PREFIX}/bin/autoconf"
-    ln -sf "${PREFIX}/bin/autoheader-2.69" "${DESTDIR}${PREFIX}/bin/autoheader"
-    ln -sf "${PREFIX}/bin/autom4te-2.69" "${DESTDIR}${PREFIX}/bin/autom4te"
-    ln -sf "${PREFIX}/bin/autoreconf-2.69" "${DESTDIR}${PREFIX}/bin/autoreconf"
 }
diff --git a/sysc/automake-1.11.2/automake-1.11.2.sh b/sysc/automake-1.11.2/automake-1.11.2.sh
index a3796f6c..9744413e 100755
--- a/sysc/automake-1.11.2/automake-1.11.2.sh
+++ b/sysc/automake-1.11.2/automake-1.11.2.sh
@@ -8,13 +8,13 @@ urls="http://mirrors.kernel.org/gnu/automake/automake-1.11.2.tar.bz2"
 src_prepare() {
     default
 
-    rm doc/amhello-1.0.tar.gz doc/automake.info*
+    rm -f doc/amhello-1.0.tar.gz doc/automake.info* doc/aclocal-1.11.1 doc/automake-1.11.1
 
-    ./bootstrap
+    AUTOCONF=autoconf-2.64 AUTOM4TE=autom4te-2.64 ./bootstrap
 }
 
 src_configure() {
-    ./configure --prefix="${PREFIX}"
+    AUTORECONF=autoreconf-2.64 AUTOM4TE=autom4te-2.64 AUTOHEADER=autoheader-2.64 AUTOCONF=autoconf-2.64 ./configure --prefix="${PREFIX}"
 }
 
 src_compile() {
diff --git a/sysc/automake-1.15.1/automake-1.15.1.sh b/sysc/automake-1.15.1/automake-1.15.1.sh
index d12587f9..031f8bf9 100755
--- a/sysc/automake-1.15.1/automake-1.15.1.sh
+++ b/sysc/automake-1.15.1/automake-1.15.1.sh
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
 # SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
@@ -10,7 +10,7 @@ src_prepare() {
 
     rm doc/amhello-1.0.tar.gz
 
-    ./bootstrap
+    AUTOCONF=autoconf-2.69 AUTOM4TE=autom4te-2.69 ./bootstrap
 
     rm doc/automake-history.info doc/automake.info*
 
@@ -18,7 +18,7 @@ src_prepare() {
 }
 
 src_configure() {
-    ./configure --prefix="${PREFIX}"
+    AUTORECONF=autoreconf-2.69 AUTOM4TE=autom4te-2.69 AUTOHEADER=autoheader-2.69 AUTOCONF=autoconf-2.69 ./configure --prefix="${PREFIX}"
 }
 
 src_compile() {
diff --git a/sysc/automake-1.16.3/automake-1.16.3.sh b/sysc/automake-1.16.3/automake-1.16.3.sh
index 2629602e..bdcb88bd 100755
--- a/sysc/automake-1.16.3/automake-1.16.3.sh
+++ b/sysc/automake-1.16.3/automake-1.16.3.sh
@@ -5,7 +5,7 @@
 urls="https://mirrors.kernel.org/gnu/automake/automake-1.16.3.tar.xz"
 
 src_prepare() {
-    ./bootstrap
+    AUTOCONF=autoconf-2.69 AUTOM4TE=autom4te-2.69 ./bootstrap
 
     rm doc/automake-history.info doc/automake.info*
 
@@ -13,7 +13,7 @@ src_prepare() {
 }
 
 src_configure() {
-    ./configure --prefix="${PREFIX}"
+    AUTOCONF=autoconf-2.69 ./configure --prefix="${PREFIX}"
 }
 
 src_compile() {
diff --git a/sysc/bison-3.4.2/bison-3.4.2.sh b/sysc/bison-3.4.2/bison-3.4.2.sh
index 900a69ff..39cb6ace 100755
--- a/sysc/bison-3.4.2/bison-3.4.2.sh
+++ b/sysc/bison-3.4.2/bison-3.4.2.sh
@@ -20,7 +20,7 @@ src_prepare() {
 
     ../../import-gnulib.sh
 
-    AUTOPOINT=true autoreconf -fi
+    AUTOPOINT=true autoreconf-2.69 -fi
 }
 
 src_configure() {
diff --git a/sysc/curl-7.83.0/curl-7.83.0.sh b/sysc/curl-7.83.0/curl-7.83.0.sh
index 290b26fb..f5f23e7c 100755
--- a/sysc/curl-7.83.0/curl-7.83.0.sh
+++ b/sysc/curl-7.83.0/curl-7.83.0.sh
@@ -17,7 +17,7 @@ src_prepare() {
     rm config.guess config.sub ltmain.sh
     libtoolize
 
-    autoreconf -fi
+    autoreconf-2.69 -fi
 }
 
 src_configure() {
diff --git a/sysc/flex-2.5.33/flex-2.5.33.sh b/sysc/flex-2.5.33/flex-2.5.33.sh
index caa8041a..25f761ac 100755
--- a/sysc/flex-2.5.33/flex-2.5.33.sh
+++ b/sysc/flex-2.5.33/flex-2.5.33.sh
@@ -7,7 +7,7 @@ urls="http://download.nust.na/pub2/openpkg1/sources/DST/flex/flex-2.5.33.tar.gz"
 src_prepare() {
     default
 
-    AUTOPOINT=true autoreconf -fi
+    AUTOPOINT=true autoreconf-2.69 -fi
 
     # Remove pregenerated files
     rm parse.c parse.h scan.c 
diff --git a/sysc/gmp-6.2.1/gmp-6.2.1.sh b/sysc/gmp-6.2.1/gmp-6.2.1.sh
index e213da01..8d613bdb 100755
--- a/sysc/gmp-6.2.1/gmp-6.2.1.sh
+++ b/sysc/gmp-6.2.1/gmp-6.2.1.sh
@@ -10,7 +10,7 @@ src_prepare() {
     # Remove bison and flex generated files
     rm demos/calc/calc.{c,h} demos/calc/calclex.c
 
-    autoreconf -f -i
+    autoreconf-2.69 -fi
 
     # Pre-built texinfo files
     find . -name '*.info*' -delete
diff --git a/sysc/libarchive-3.5.2/libarchive-3.5.2.sh b/sysc/libarchive-3.5.2/libarchive-3.5.2.sh
index 6045e39d..f652a9a8 100755
--- a/sysc/libarchive-3.5.2/libarchive-3.5.2.sh
+++ b/sysc/libarchive-3.5.2/libarchive-3.5.2.sh
@@ -7,7 +7,7 @@ urls="http://libarchive.org/downloads/libarchive-3.5.2.tar.xz"
 src_prepare() {
     default
 
-    autoreconf -fi
+    autoreconf-2.69 -fi
 }
 
 src_configure() {
diff --git a/sysc/make-4.2.1/make-4.2.1.sh b/sysc/make-4.2.1/make-4.2.1.sh
index d6854470..189852d6 100755
--- a/sysc/make-4.2.1/make-4.2.1.sh
+++ b/sysc/make-4.2.1/make-4.2.1.sh
@@ -11,7 +11,7 @@ src_prepare() {
     touch doc/make.info
 
     # We don't have autopoint from gettext yet
-    AUTOPOINT=true autoreconf -fi
+    AUTOPOINT=true autoreconf-2.69 -fi
 }
 
 src_configure() {
diff --git a/sysc/pkg-config-0.29.2/pkg-config-0.29.2.sh b/sysc/pkg-config-0.29.2/pkg-config-0.29.2.sh
index 51c94734..7db3ab02 100755
--- a/sysc/pkg-config-0.29.2/pkg-config-0.29.2.sh
+++ b/sysc/pkg-config-0.29.2/pkg-config-0.29.2.sh
@@ -5,7 +5,7 @@
 urls="http://gentoo.osuosl.org/distfiles/pkg-config-0.29.2.tar.gz"
 
 src_prepare() {
-    autoreconf -fi
+    autoreconf-2.69 -fi
 }
 
 src_configure() {
diff --git a/sysc/tar-1.34/tar-1.34.sh b/sysc/tar-1.34/tar-1.34.sh
index 171ab03f..04f18084 100755
--- a/sysc/tar-1.34/tar-1.34.sh
+++ b/sysc/tar-1.34/tar-1.34.sh
@@ -12,7 +12,7 @@ src_prepare() {
     . ../../import-gnulib.sh
 
     # We don't have autopoint from gettext yet
-    AUTOPOINT=true autoreconf -fi
+    AUTOPOINT=true autoreconf-2.69 -fi
 
     # Remove bison pregenerated file
     rm gnu/parse-datetime.c
diff --git a/sysc/xz-5.0.5/xz-5.0.5.sh b/sysc/xz-5.0.5/xz-5.0.5.sh
index 14d04943..8d4efa8a 100755
--- a/sysc/xz-5.0.5/xz-5.0.5.sh
+++ b/sysc/xz-5.0.5/xz-5.0.5.sh
@@ -7,7 +7,7 @@ urls="http://ixpeering.dl.sourceforge.net/project/lzmautils/xz-5.0.5.tar.bz2"
 src_prepare() {
     default
 
-    autoreconf-2.64 -f
+    AUTOCONF=autoconf-2.64 AUTOM4TE=autom4te-2.64 autoreconf-2.64 -f
 }
 
 src_configure() {

From 7e95cbbefb0f534e2696dd9b59b8e18912fe66f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Thu, 7 Jul 2022 20:43:39 +0100
Subject: [PATCH 2/2] Switch to unversioned automake.

---
 sysa/SHA256SUMS.pkgs                               | 14 +++++++-------
 sysa/autoconf-2.55/autoconf-2.55.sh                |  2 +-
 sysa/autoconf-2.57/autoconf-2.57.sh                |  2 +-
 sysa/autoconf-2.59/autoconf-2.59.sh                |  4 ++--
 sysa/autoconf-2.61/autoconf-2.61.sh                |  4 ++--
 sysa/autoconf-2.64/autoconf-2.64.sh                |  2 +-
 sysa/automake-1.10.3/automake-1.10.3.sh            |  1 +
 sysa/automake-1.7.8/automake-1.7.8.sh              |  5 +++--
 sysa/automake-1.7/automake-1.7.sh                  |  4 ++--
 sysa/automake-1.8.5/automake-1.8.5.sh              |  5 +++--
 sysa/automake-1.9.6/automake-1.9.6.sh              |  5 +++--
 sysa/curl-7.83.0/curl-7.83.0.sh                    |  2 +-
 sysa/e2fsprogs-1.45.7/e2fsprogs-1.45.7.sh          |  2 +-
 sysa/findutils-4.2.33/findutils-4.2.33.sh          |  2 +-
 sysa/help2man-1.36.4/help2man-1.36.4.sh            |  2 +-
 sysa/kbd-1.15/kbd-1.15.sh                          |  2 +-
 sysa/kexec-tools-2.0.22/kexec-tools-2.0.22.sh      |  2 +-
 sysa/libtool-2.2.4/libtool-2.2.4.sh                |  2 +-
 sysa/make-3.82/make-3.82.sh                        |  2 +-
 sysa/util-linux-2.19.1/util-linux-2.19.1.sh        |  2 +-
 sysc/autoconf-2.69/autoconf-2.69.sh                |  2 +-
 .../autoconf-archive-2021.02.19.sh                 |  2 +-
 sysc/automake-1.11.2/automake-1.11.2.sh            |  3 ++-
 sysc/automake-1.15.1/automake-1.15.1.sh            |  1 +
 sysc/automake-1.16.3/automake-1.16.3.sh            |  2 +-
 sysc/bison-2.3/bison-2.3.sh                        |  2 +-
 sysc/bison-3.4.2/bison-3.4.2.sh                    |  2 +-
 sysc/coreutils-8.32/coreutils-8.32.sh              |  2 +-
 sysc/curl-7.83.0/curl-7.83.0.sh                    |  2 +-
 sysc/flex-2.5.33/flex-2.5.33.sh                    |  2 +-
 sysc/gmp-6.2.1/gmp-6.2.1.sh                        |  2 +-
 sysc/libarchive-3.5.2/libarchive-3.5.2.sh          |  2 +-
 sysc/make-4.2.1/make-4.2.1.sh                      |  2 +-
 sysc/mpc-1.2.1/mpc-1.2.1.sh                        |  2 +-
 sysc/mpfr-4.1.0/mpfr-4.1.0.sh                      |  2 +-
 sysc/pkg-config-0.29.2/pkg-config-0.29.2.sh        |  2 +-
 sysc/tar-1.34/tar-1.34.sh                          |  2 +-
 sysc/xz-5.0.5/xz-5.0.5.sh                          |  2 +-
 38 files changed, 54 insertions(+), 48 deletions(-)

diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs
index c1bc46f4..9671e3ef 100644
--- a/sysa/SHA256SUMS.pkgs
+++ b/sysa/SHA256SUMS.pkgs
@@ -12,18 +12,18 @@ d5fcce4baea5e11f983a7e4b7148545ab6720bb4e010898c73387f6711be67f4  autoconf-2.64_
 298dcf17a439adb306237b308e3c4ed3d376cb863ae0f0f08bfdf1f3199a548b  autoconf-2.69_0.tar.bz2
 d713ac1840e82250414ee4f7cd75c79ee44ecb4e8dfc659704eed3d75e7d348c  autoconf-2.71_0.x86.xbps
 6ff691e3ddd4f3d1796d28b07a2a96691dbd9801844c99ccbe660da59dabd74b  autoconf-archive-2021.02.19_0.tar.bz2
-cf6b7bbdba1a58b0cc1e6dae36a82e3b28db8ee1e948225d72530accee32aaab  automake-1.10.3_0.tar.bz2
-778efda0ea7a85c49a8d4f2ceda7dca1eb3e77ef91e3cd4036302bb5e90a620f  automake-1.11.2_0.tar.bz2
-27cbc3f942fb386ad4fceb62188722dbd8a833082bc037e4f1688927a3df854d  automake-1.15.1_0.tar.bz2
+fbd8739c8f69b388e2c54893faa1180cc38f2718339da82788312adb0201c5d0  automake-1.10.3_0.tar.bz2
+e5eae329b2f6854c18844df70fe13975d3c5394708e274616bc4168e55801b41  automake-1.11.2_0.tar.bz2
+732d12fdeea2c234750c8e91c90a90934d279283839cdabe0343fa765ba24168  automake-1.15.1_0.tar.bz2
 a9c66f944e0dbebb3661bb134795749a6f3ef69abb69d6080ac90446b8cfb5e7  automake-1.16.3_0.x86.xbps
 51ef85383c0afe88c17a25f8b49c4dfdd77c1cc6aa81568ec09d45a15d580de8  automake-1.4-p6_0.tar.bz2
 8ec3af09fd23256f89b27833a8311ed347caf93d611b1209232ce104bb6fb4ef  automake-1.6.3_0.tar.bz2
 031119cb14859c8bf80d5df5e0bbc475cf67f04b645dc55c80bcabe1bb31a8cd  automake-1.6.3_1.tar.bz2
 b2eab85c4a22060cc18945f6cb24cdf928fee370fff3fe12482e866a1cace586  automake-1.6.3_2.tar.bz2
-ddd61cfdaea7a7a9b85eff7e2e597bf6c8af05215e34fd05a5c97f6afc5c31ef  automake-1.7.8_0.tar.bz2
-8f8c29596333ddb8bf3d0e7ed5ee514e75cd248f06961f1ef666e6410e2d384c  automake-1.7_0.tar.bz2
-d52aa64563e2a6fce48bb751fab9802a997772132d9e612ec77274e0e9bac3c9  automake-1.8.5_0.tar.bz2
-df5ab8ac7f13eb7aa5211ad4609578f0bb1ed4957ac5737cb78466f644760019  automake-1.9.6_0.tar.bz2
+76e897ec8e683eb15ab621c3a0d86613bc7cae43631c94e9c6388eb08db191ca  automake-1.7.8_0.tar.bz2
+58a9ccbba82dda35673404135a855c19351ac758b2ac0c1e112d193b1dfb7df5  automake-1.7_0.tar.bz2
+75c5f2c2f636c4d763eef650ffdf638ff372444dce74e5c9bfe7c5ec824c2a26  automake-1.8.5_0.tar.bz2
+42fe9a42c457193e7bebf31b71eb28bc71e179ed9f2c78be242a5f6b03bbbbfe  automake-1.9.6_0.tar.bz2
 e180c61e3922b0546a6a3ee498abeba6dfdd404215ca850628a5277e5ede26e7  bash-5.1_0.tar.bz2
 a6190872c4daf1b55a1ad1f2fd2e34bd251f3808f750bb4a7920b66d672497a8  binutils-2.14_0.tar.bz2
 f566a5cb99adc8f572659ebf4a778ff23acf62d90b13a9983f56488a493b15b2  bison-2.3_0.tar.bz2
diff --git a/sysa/autoconf-2.55/autoconf-2.55.sh b/sysa/autoconf-2.55/autoconf-2.55.sh
index 15cb0c00..55ad1404 100755
--- a/sysa/autoconf-2.55/autoconf-2.55.sh
+++ b/sysa/autoconf-2.55/autoconf-2.55.sh
@@ -10,7 +10,7 @@ src_prepare() {
     # Do not use pregenerated manpages
     sed -i '/SUBDIRS/s/ man//' Makefile.am
 
-    AUTOCONF=autoconf-2.54 autoreconf-2.54
+    AUTOMAKE=automake-1.7 ACLOCAL=aclocal-1.7 AUTOCONF=autoconf-2.54 autoreconf-2.54
 
     # Install autoconf data files into versioned directory
     for file in */*/Makefile.in */Makefile.in Makefile.in; do
diff --git a/sysa/autoconf-2.57/autoconf-2.57.sh b/sysa/autoconf-2.57/autoconf-2.57.sh
index f867aa2c..877a7c63 100755
--- a/sysa/autoconf-2.57/autoconf-2.57.sh
+++ b/sysa/autoconf-2.57/autoconf-2.57.sh
@@ -9,7 +9,7 @@ src_prepare() {
     # Do not use pregenerated manpages
     sed -i '/SUBDIRS/s/ man//' Makefile.am
 
-    AUTOCONF=autoconf-2.55 autoreconf-2.55 -f
+    AUTOMAKE=automake-1.7 ACLOCAL=aclocal-1.7 AUTOCONF=autoconf-2.55 autoreconf-2.55 -f
 
     # Install autoconf data files into versioned directory
     for file in */*/Makefile.in */Makefile.in Makefile.in; do
diff --git a/sysa/autoconf-2.59/autoconf-2.59.sh b/sysa/autoconf-2.59/autoconf-2.59.sh
index 190e69d4..bfff32d2 100755
--- a/sysa/autoconf-2.59/autoconf-2.59.sh
+++ b/sysa/autoconf-2.59/autoconf-2.59.sh
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -9,7 +9,7 @@ src_prepare() {
     # Do not use pregenerated manpages
     sed -i '/SUBDIRS/s/ man//' Makefile.am
 
-    AUTOCONF=autoconf-2.57 autoreconf-2.57 -f
+    AUTOMAKE=automake-1.7 ACLOCAL=aclocal-1.7 AUTOCONF=autoconf-2.57 autoreconf-2.57 -f
 
     # Install autoconf data files into versioned directory
     for file in */*/Makefile.in */Makefile.in Makefile.in; do
diff --git a/sysa/autoconf-2.61/autoconf-2.61.sh b/sysa/autoconf-2.61/autoconf-2.61.sh
index 25220fa8..10e32ea0 100755
--- a/sysa/autoconf-2.61/autoconf-2.61.sh
+++ b/sysa/autoconf-2.61/autoconf-2.61.sh
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -6,7 +6,7 @@ src_prepare() {
     rm doc/standards.info man/*.1
     sed -i -e '/AC_PROG_GREP/d' -e '/AC_PROG_SED/d' configure.ac
 
-    AUTOM4TE=autom4te-2.59 AUTOCONF=autoconf-2.59 autoreconf-2.59 -f
+    AUTOMAKE=automake-1.8 ACLOCAL=aclocal-1.8 AUTOM4TE=autom4te-2.59 AUTOCONF=autoconf-2.59 autoreconf-2.59 -f
 
     # Install autoconf data files into versioned directory
     for file in */*/Makefile.in */Makefile.in Makefile.in; do
diff --git a/sysa/autoconf-2.64/autoconf-2.64.sh b/sysa/autoconf-2.64/autoconf-2.64.sh
index ec316c09..0ef02ba0 100755
--- a/sysa/autoconf-2.64/autoconf-2.64.sh
+++ b/sysa/autoconf-2.64/autoconf-2.64.sh
@@ -5,7 +5,7 @@
 src_prepare() {
     rm doc/standards.info man/*.1
 
-    AUTOM4TE=autom4te-2.61 AUTOCONF=autoconf-2.61 autoreconf-2.61 -f
+    AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 AUTOM4TE=autom4te-2.61 AUTOCONF=autoconf-2.61 autoreconf-2.61 -f
 
     # Install autoconf data files into versioned directory
     for file in */*/Makefile.in */Makefile.in Makefile.in; do
diff --git a/sysa/automake-1.10.3/automake-1.10.3.sh b/sysa/automake-1.10.3/automake-1.10.3.sh
index ba8f8703..45ba75d5 100755
--- a/sysa/automake-1.10.3/automake-1.10.3.sh
+++ b/sysa/automake-1.10.3/automake-1.10.3.sh
@@ -23,6 +23,7 @@ src_compile() {
 src_install() {
     make install MAKEINFO=true DESTDIR="${DESTDIR}"
     rm "${DESTDIR}${PREFIX}/share/doc/automake/amhello-1.0.tar.gz"
+    rm "${DESTDIR}/usr/bin/automake" "${DESTDIR}/usr/bin/aclocal"
 
     # Delete some stray directories
     rm -r "${DESTDIR}${SOURCES}"
diff --git a/sysa/automake-1.7.8/automake-1.7.8.sh b/sysa/automake-1.7.8/automake-1.7.8.sh
index 87fd32b6..da1ee381 100755
--- a/sysa/automake-1.7.8/automake-1.7.8.sh
+++ b/sysa/automake-1.7.8/automake-1.7.8.sh
@@ -1,11 +1,11 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 src_prepare() {
     rm -- configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info*
 
-    AUTOCONF=autoconf-2.55 autoreconf-2.55
+    AUTOMAKE=automake-1.7 ACLOCAL=aclocal-1.7 AUTOCONF=autoconf-2.55 autoreconf-2.55
 }
 
 src_configure() {
@@ -18,4 +18,5 @@ src_compile() {
 
 src_install() {
     make install MAKEINFO=true DESTDIR="${DESTDIR}"
+    rm "${DESTDIR}/usr/bin/automake" "${DESTDIR}/usr/bin/aclocal"
 }
diff --git a/sysa/automake-1.7/automake-1.7.sh b/sysa/automake-1.7/automake-1.7.sh
index 25b8348d..d5e6c1f0 100755
--- a/sysa/automake-1.7/automake-1.7.sh
+++ b/sysa/automake-1.7/automake-1.7.sh
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -20,5 +20,5 @@ src_compile() {
 
 src_install() {
     make install MAKEINFO=true DESTDIR="${DESTDIR}"
+    rm "${DESTDIR}/usr/bin/automake" "${DESTDIR}/usr/bin/aclocal"
 }
-
diff --git a/sysa/automake-1.8.5/automake-1.8.5.sh b/sysa/automake-1.8.5/automake-1.8.5.sh
index 87e7d9dc..fcecab9b 100755
--- a/sysa/automake-1.8.5/automake-1.8.5.sh
+++ b/sysa/automake-1.8.5/automake-1.8.5.sh
@@ -1,11 +1,11 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 src_prepare() {
     rm doc/automake.info*
 
-    AUTOCONF=autoconf-2.59 autoreconf-2.59 -f
+    AUTOMAKE=automake-1.7 ACLOCAL=aclocal-1.7 AUTOCONF=autoconf-2.59 autoreconf-2.59 -f
 }
 
 src_configure() {
@@ -18,4 +18,5 @@ src_compile() {
 
 src_install() {
     make install MAKEINFO=true DESTDIR="${DESTDIR}"
+    rm "${DESTDIR}/usr/bin/automake" "${DESTDIR}/usr/bin/aclocal"
 }
diff --git a/sysa/automake-1.9.6/automake-1.9.6.sh b/sysa/automake-1.9.6/automake-1.9.6.sh
index 5083980a..de4e5386 100755
--- a/sysa/automake-1.9.6/automake-1.9.6.sh
+++ b/sysa/automake-1.9.6/automake-1.9.6.sh
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -6,7 +6,7 @@ src_prepare() {
     rm doc/automake.info*
 
     sed -i 's/1.8a/1.8.5/; s/ filename-length-max=99//' configure.ac
-    AUTOM4TE=autom4te-2.61 AUTOCONF=autoconf-2.61 autoreconf-2.61 -f
+    AUTOMAKE=automake-1.8 ACLOCAL=aclocal-1.8 AUTOM4TE=autom4te-2.61 AUTOCONF=autoconf-2.61 autoreconf-2.61 -f
 }
 
 src_configure() {
@@ -19,4 +19,5 @@ src_compile() {
 
 src_install() {
     make install MAKEINFO=true DESTDIR="${DESTDIR}"
+    rm "${DESTDIR}/usr/bin/automake" "${DESTDIR}/usr/bin/aclocal"
 }
diff --git a/sysa/curl-7.83.0/curl-7.83.0.sh b/sysa/curl-7.83.0/curl-7.83.0.sh
index 73ba7eef..950ee015 100755
--- a/sysa/curl-7.83.0/curl-7.83.0.sh
+++ b/sysa/curl-7.83.0/curl-7.83.0.sh
@@ -15,7 +15,7 @@ src_prepare() {
     rm config.guess config.sub ltmain.sh
     libtoolize
 
-    AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi
+    AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi
 }
 
 src_configure() {
diff --git a/sysa/e2fsprogs-1.45.7/e2fsprogs-1.45.7.sh b/sysa/e2fsprogs-1.45.7/e2fsprogs-1.45.7.sh
index 312446dd..964d53e5 100755
--- a/sysa/e2fsprogs-1.45.7/e2fsprogs-1.45.7.sh
+++ b/sysa/e2fsprogs-1.45.7/e2fsprogs-1.45.7.sh
@@ -16,7 +16,7 @@ src_prepare() {
     rm config/config.guess config/config.sub config/ltmain.sh
     libtoolize -i
 
-    AUTOCONF=autoconf-2.64 AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi
+    AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 AUTOCONF=autoconf-2.64 AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi
 
     # Remove bison parser generated
     rm intl/plural.y
diff --git a/sysa/findutils-4.2.33/findutils-4.2.33.sh b/sysa/findutils-4.2.33/findutils-4.2.33.sh
index 0e32326e..477624b7 100755
--- a/sysa/findutils-4.2.33/findutils-4.2.33.sh
+++ b/sysa/findutils-4.2.33/findutils-4.2.33.sh
@@ -10,7 +10,7 @@ src_prepare() {
 
     default
 
-    AUTOM4TE=autom4te-2.61 AUTOCONF=autoconf-2.61 autoreconf-2.61 -f
+    AUTOMAKE=automake-1.9 ACLOCAL=aclocal-1.9 AUTOM4TE=autom4te-2.61 AUTOCONF=autoconf-2.61 autoreconf-2.61 -f
 
     # Pre-built texinfo files
     rm doc/find.info
diff --git a/sysa/help2man-1.36.4/help2man-1.36.4.sh b/sysa/help2man-1.36.4/help2man-1.36.4.sh
index 6123d3bc..1fed9a17 100755
--- a/sysa/help2man-1.36.4/help2man-1.36.4.sh
+++ b/sysa/help2man-1.36.4/help2man-1.36.4.sh
@@ -6,7 +6,7 @@
 src_prepare() {
     default
 
-    autoreconf-2.59 -f
+    ACLOCAL=aclocal-1.8 AUTOMAKE=automeke-1.8 autoreconf-2.59 -f
 
     rm help2man.info
     touch help2man.info
diff --git a/sysa/kbd-1.15/kbd-1.15.sh b/sysa/kbd-1.15/kbd-1.15.sh
index dbc23df5..39e5287a 100755
--- a/sysa/kbd-1.15/kbd-1.15.sh
+++ b/sysa/kbd-1.15/kbd-1.15.sh
@@ -12,7 +12,7 @@ src_prepare() {
     sed -i -e 's/u_char/unsigned char/g' \
         -e 's/u_short/unsigned short/g' src/dumpkeys.c src/loadkeys.y
 
-    AUTOPOINT=true AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi
+    AUTOPOINT=true AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi
 }
 
 src_configure() {
diff --git a/sysa/kexec-tools-2.0.22/kexec-tools-2.0.22.sh b/sysa/kexec-tools-2.0.22/kexec-tools-2.0.22.sh
index c903fe49..47804c0f 100755
--- a/sysa/kexec-tools-2.0.22/kexec-tools-2.0.22.sh
+++ b/sysa/kexec-tools-2.0.22/kexec-tools-2.0.22.sh
@@ -6,7 +6,7 @@
 src_prepare() {
     default
 
-    AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi
+    AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi
 }
 
 src_configure() {
diff --git a/sysa/libtool-2.2.4/libtool-2.2.4.sh b/sysa/libtool-2.2.4/libtool-2.2.4.sh
index 49b72ff1..9a05efd3 100755
--- a/sysa/libtool-2.2.4/libtool-2.2.4.sh
+++ b/sysa/libtool-2.2.4/libtool-2.2.4.sh
@@ -10,7 +10,7 @@ src_prepare() {
 
     rm -f doc/*.info
 
-    AUTOM4TE=autom4te-2.61 AUTOCONF=autoconf-2.61 AUTOHEADER=autoheader-2.61 AUTORECONF=autoreconf-2.61 ./bootstrap
+    AUTOMAKE=automake-1.9 ACLOCAL=aclocal-1.9 AUTOM4TE=autom4te-2.61 AUTOCONF=autoconf-2.61 AUTOHEADER=autoheader-2.61 AUTORECONF=autoreconf-2.61 ./bootstrap
 }
 
 src_configure() {
diff --git a/sysa/make-3.82/make-3.82.sh b/sysa/make-3.82/make-3.82.sh
index 4721dd96..d9792b63 100755
--- a/sysa/make-3.82/make-3.82.sh
+++ b/sysa/make-3.82/make-3.82.sh
@@ -9,7 +9,7 @@ src_prepare() {
     touch doc/make.info
 
     # We don't have autopoint from gettext yet
-    AUTOPOINT=true AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi
+    AUTOPOINT=true AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi
 }
 
 src_configure() {
diff --git a/sysa/util-linux-2.19.1/util-linux-2.19.1.sh b/sysa/util-linux-2.19.1/util-linux-2.19.1.sh
index 42e91c88..8e7bd722 100755
--- a/sysa/util-linux-2.19.1/util-linux-2.19.1.sh
+++ b/sysa/util-linux-2.19.1/util-linux-2.19.1.sh
@@ -6,7 +6,7 @@ src_prepare() {
     default
 
     # We don't have gettext (autopoint) yet.
-    AUTOPOINT=true AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi
+    AUTOPOINT=true AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi
 }
 
 src_configure() {
diff --git a/sysc/autoconf-2.69/autoconf-2.69.sh b/sysc/autoconf-2.69/autoconf-2.69.sh
index c4589bb9..b66c4a3e 100755
--- a/sysc/autoconf-2.69/autoconf-2.69.sh
+++ b/sysc/autoconf-2.69/autoconf-2.69.sh
@@ -7,7 +7,7 @@ urls="http://mirrors.kernel.org/gnu/autoconf/autoconf-2.69.tar.xz"
 
 src_prepare() {
     rm doc/standards.info man/*.1
-    autoreconf-2.64 -f
+    AUTOMAKE=automake-1.11 ACLOCAL=aclocal-1.11 autoreconf-2.64 -f
 
     # Install autoconf data files into versioned directory
     for file in */*/Makefile.in */Makefile.in Makefile.in; do
diff --git a/sysc/autoconf-archive-2021.02.19/autoconf-archive-2021.02.19.sh b/sysc/autoconf-archive-2021.02.19/autoconf-archive-2021.02.19.sh
index 965506b3..e8983c50 100755
--- a/sysc/autoconf-archive-2021.02.19/autoconf-archive-2021.02.19.sh
+++ b/sysc/autoconf-archive-2021.02.19/autoconf-archive-2021.02.19.sh
@@ -5,7 +5,7 @@
 urls="http://mirrors.kernel.org/gnu/autoconf-archive/autoconf-archive-2021.02.19.tar.xz"
 
 src_prepare() {
-    autoreconf-2.69 -fi
+    AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi
 }
 
 src_configure() {
diff --git a/sysc/automake-1.11.2/automake-1.11.2.sh b/sysc/automake-1.11.2/automake-1.11.2.sh
index 9744413e..a80117ca 100755
--- a/sysc/automake-1.11.2/automake-1.11.2.sh
+++ b/sysc/automake-1.11.2/automake-1.11.2.sh
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
 # SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
@@ -23,5 +23,6 @@ src_compile() {
 
 src_install() {
     make install MAKEINFO=true DESTDIR="${DESTDIR}"
+    rm "${DESTDIR}/usr/bin/automake" "${DESTDIR}/usr/bin/aclocal"
     rm "${DESTDIR}${PREFIX}/share/doc/automake/amhello-1.0.tar.gz"
 }
diff --git a/sysc/automake-1.15.1/automake-1.15.1.sh b/sysc/automake-1.15.1/automake-1.15.1.sh
index 031f8bf9..593e5211 100755
--- a/sysc/automake-1.15.1/automake-1.15.1.sh
+++ b/sysc/automake-1.15.1/automake-1.15.1.sh
@@ -27,5 +27,6 @@ src_compile() {
 
 src_install() {
     make install MAKEINFO=true DESTDIR="${DESTDIR}"
+    rm "${DESTDIR}/usr/bin/automake" "${DESTDIR}/usr/bin/aclocal"
     rm "${DESTDIR}${PREFIX}/share/doc/automake/amhello-1.0.tar.gz"
 }
diff --git a/sysc/automake-1.16.3/automake-1.16.3.sh b/sysc/automake-1.16.3/automake-1.16.3.sh
index bdcb88bd..93f5f8e9 100755
--- a/sysc/automake-1.16.3/automake-1.16.3.sh
+++ b/sysc/automake-1.16.3/automake-1.16.3.sh
@@ -5,7 +5,7 @@
 urls="https://mirrors.kernel.org/gnu/automake/automake-1.16.3.tar.xz"
 
 src_prepare() {
-    AUTOCONF=autoconf-2.69 AUTOM4TE=autom4te-2.69 ./bootstrap
+    AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 AUTOCONF=autoconf-2.69 AUTOM4TE=autom4te-2.69 ./bootstrap
 
     rm doc/automake-history.info doc/automake.info*
 
diff --git a/sysc/bison-2.3/bison-2.3.sh b/sysc/bison-2.3/bison-2.3.sh
index c1d6a88c..10776f5a 100755
--- a/sysc/bison-2.3/bison-2.3.sh
+++ b/sysc/bison-2.3/bison-2.3.sh
@@ -11,7 +11,7 @@ src_prepare() {
 
     ../../import-gnulib.sh
 
-    AUTOPOINT=true autoreconf-2.69 -fi
+    AUTOPOINT=true AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi
 
     # Remove pregenerated files
     rm src/parse-gram.c src/parse-gram.h src/scan-skel.c src/scan-gram.c
diff --git a/sysc/bison-3.4.2/bison-3.4.2.sh b/sysc/bison-3.4.2/bison-3.4.2.sh
index 39cb6ace..c8f07640 100755
--- a/sysc/bison-3.4.2/bison-3.4.2.sh
+++ b/sysc/bison-3.4.2/bison-3.4.2.sh
@@ -20,7 +20,7 @@ src_prepare() {
 
     ../../import-gnulib.sh
 
-    AUTOPOINT=true autoreconf-2.69 -fi
+    AUTOPOINT=true AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi
 }
 
 src_configure() {
diff --git a/sysc/coreutils-8.32/coreutils-8.32.sh b/sysc/coreutils-8.32/coreutils-8.32.sh
index dcd22d5c..064161b0 100755
--- a/sysc/coreutils-8.32/coreutils-8.32.sh
+++ b/sysc/coreutils-8.32/coreutils-8.32.sh
@@ -23,7 +23,7 @@ regenerate_files() {
     echo "$VERSION" > .tarball-version
 
     # We don't have autopoint from gettext yet.
-    AUTOPOINT=true autoreconf-2.69 -fi
+    AUTOPOINT=true AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi
 }
 
 src_prepare() {
diff --git a/sysc/curl-7.83.0/curl-7.83.0.sh b/sysc/curl-7.83.0/curl-7.83.0.sh
index f5f23e7c..7742f97f 100755
--- a/sysc/curl-7.83.0/curl-7.83.0.sh
+++ b/sysc/curl-7.83.0/curl-7.83.0.sh
@@ -17,7 +17,7 @@ src_prepare() {
     rm config.guess config.sub ltmain.sh
     libtoolize
 
-    autoreconf-2.69 -fi
+    AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi
 }
 
 src_configure() {
diff --git a/sysc/flex-2.5.33/flex-2.5.33.sh b/sysc/flex-2.5.33/flex-2.5.33.sh
index 25f761ac..f7c2c697 100755
--- a/sysc/flex-2.5.33/flex-2.5.33.sh
+++ b/sysc/flex-2.5.33/flex-2.5.33.sh
@@ -7,7 +7,7 @@ urls="http://download.nust.na/pub2/openpkg1/sources/DST/flex/flex-2.5.33.tar.gz"
 src_prepare() {
     default
 
-    AUTOPOINT=true autoreconf-2.69 -fi
+    AUTOPOINT=true AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi
 
     # Remove pregenerated files
     rm parse.c parse.h scan.c 
diff --git a/sysc/gmp-6.2.1/gmp-6.2.1.sh b/sysc/gmp-6.2.1/gmp-6.2.1.sh
index 8d613bdb..70778a39 100755
--- a/sysc/gmp-6.2.1/gmp-6.2.1.sh
+++ b/sysc/gmp-6.2.1/gmp-6.2.1.sh
@@ -10,7 +10,7 @@ src_prepare() {
     # Remove bison and flex generated files
     rm demos/calc/calc.{c,h} demos/calc/calclex.c
 
-    autoreconf-2.69 -fi
+    AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi
 
     # Pre-built texinfo files
     find . -name '*.info*' -delete
diff --git a/sysc/libarchive-3.5.2/libarchive-3.5.2.sh b/sysc/libarchive-3.5.2/libarchive-3.5.2.sh
index f652a9a8..834b7c3d 100755
--- a/sysc/libarchive-3.5.2/libarchive-3.5.2.sh
+++ b/sysc/libarchive-3.5.2/libarchive-3.5.2.sh
@@ -7,7 +7,7 @@ urls="http://libarchive.org/downloads/libarchive-3.5.2.tar.xz"
 src_prepare() {
     default
 
-    autoreconf-2.69 -fi
+    AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi
 }
 
 src_configure() {
diff --git a/sysc/make-4.2.1/make-4.2.1.sh b/sysc/make-4.2.1/make-4.2.1.sh
index 189852d6..3aabf75f 100755
--- a/sysc/make-4.2.1/make-4.2.1.sh
+++ b/sysc/make-4.2.1/make-4.2.1.sh
@@ -11,7 +11,7 @@ src_prepare() {
     touch doc/make.info
 
     # We don't have autopoint from gettext yet
-    AUTOPOINT=true autoreconf-2.69 -fi
+    AUTOPOINT=true AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15  autoreconf-2.69 -fi
 }
 
 src_configure() {
diff --git a/sysc/mpc-1.2.1/mpc-1.2.1.sh b/sysc/mpc-1.2.1/mpc-1.2.1.sh
index bca3e8e2..8696e0e9 100755
--- a/sysc/mpc-1.2.1/mpc-1.2.1.sh
+++ b/sysc/mpc-1.2.1/mpc-1.2.1.sh
@@ -8,7 +8,7 @@ src_prepare() {
     default
 
     find . -name '*.info' -delete
-    autoreconf-2.69 -fi
+    AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi
 }
 
 src_configure() {
diff --git a/sysc/mpfr-4.1.0/mpfr-4.1.0.sh b/sysc/mpfr-4.1.0/mpfr-4.1.0.sh
index 1db8d4bf..65dc3f8e 100755
--- a/sysc/mpfr-4.1.0/mpfr-4.1.0.sh
+++ b/sysc/mpfr-4.1.0/mpfr-4.1.0.sh
@@ -8,7 +8,7 @@ src_prepare() {
     default
 
     find . -name '*.info' -delete
-    autoreconf-2.69 -fi
+    AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi
 }
 
 src_configure() {
diff --git a/sysc/pkg-config-0.29.2/pkg-config-0.29.2.sh b/sysc/pkg-config-0.29.2/pkg-config-0.29.2.sh
index 7db3ab02..8a85b57f 100755
--- a/sysc/pkg-config-0.29.2/pkg-config-0.29.2.sh
+++ b/sysc/pkg-config-0.29.2/pkg-config-0.29.2.sh
@@ -5,7 +5,7 @@
 urls="http://gentoo.osuosl.org/distfiles/pkg-config-0.29.2.tar.gz"
 
 src_prepare() {
-    autoreconf-2.69 -fi
+    AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi
 }
 
 src_configure() {
diff --git a/sysc/tar-1.34/tar-1.34.sh b/sysc/tar-1.34/tar-1.34.sh
index 04f18084..e438bec5 100755
--- a/sysc/tar-1.34/tar-1.34.sh
+++ b/sysc/tar-1.34/tar-1.34.sh
@@ -12,7 +12,7 @@ src_prepare() {
     . ../../import-gnulib.sh
 
     # We don't have autopoint from gettext yet
-    AUTOPOINT=true autoreconf-2.69 -fi
+    AUTOPOINT=true AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi
 
     # Remove bison pregenerated file
     rm gnu/parse-datetime.c
diff --git a/sysc/xz-5.0.5/xz-5.0.5.sh b/sysc/xz-5.0.5/xz-5.0.5.sh
index 8d4efa8a..d252becb 100755
--- a/sysc/xz-5.0.5/xz-5.0.5.sh
+++ b/sysc/xz-5.0.5/xz-5.0.5.sh
@@ -7,7 +7,7 @@ urls="http://ixpeering.dl.sourceforge.net/project/lzmautils/xz-5.0.5.tar.bz2"
 src_prepare() {
     default
 
-    AUTOCONF=autoconf-2.64 AUTOM4TE=autom4te-2.64 autoreconf-2.64 -f
+    AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 AUTOCONF=autoconf-2.64 AUTOM4TE=autom4te-2.64 autoreconf-2.64 -f
 }
 
 src_configure() {