From 4dc299869aa91db2bad7e6d1218c2831fa5d8e28 Mon Sep 17 00:00:00 2001 From: Ohio2 Date: Thu, 1 Jul 2021 05:03:43 +0200 Subject: [PATCH] Makefiles use now $(MAKE) instead of `make`. --- autoconf/Makefile | 6 +++--- automake/Makefile | 12 ++++++------ bash/Makefile | 6 +++--- binutils/Makefile | 8 ++++---- bison/Makefile | 8 ++++---- busybox/Makefile | 8 ++++---- bzip2/Makefile | 12 ++++++------ curl/Makefile | 8 ++++---- flex/Makefile | 8 ++++---- gcc/Makefile | 4 ++-- git/Makefile | 6 +++--- gnuzip/Makefile | 10 ---------- gzip/Makefile | 6 +++--- hummingbird/Makefile | 6 +++--- libc/Makefile | 6 +++--- libtool/Makefile | 10 +++++----- m4/Makefile | 8 ++++---- make/Makefile | 8 ++++---- openssl/Makefile | 6 +++--- xorg/Makefile | 4 ++-- xztools/Makefile | 8 ++++---- zlib/Makefile | 8 ++++---- zsh/Makefile | 6 +++--- 23 files changed, 81 insertions(+), 91 deletions(-) delete mode 100644 gnuzip/Makefile diff --git a/autoconf/Makefile b/autoconf/Makefile index 9dc39fd..e124cda 100644 --- a/autoconf/Makefile +++ b/autoconf/Makefile @@ -2,8 +2,8 @@ prepare: git clone git://git.sv.gnu.org/autoconf cd autoconf autoconf: - make + $(MAKE) install: - make install DESTDIR="${PREFIX}" + $(MAKE) install DESTDIR="${PREFIX}" uninstall: - make uninstall + $(MAKE) uninstall diff --git a/automake/Makefile b/automake/Makefile index aaed8ab..ede7302 100644 --- a/automake/Makefile +++ b/automake/Makefile @@ -1,9 +1,9 @@ prepare: - git clone https://git.savannah.gnu.org/git/automake.git - cd automake -automake: - make + git clone https://git.savannah.gnu.org/git/auto$(MAKE).git + cd auto$(MAKE) +auto$(MAKE): + $(MAKE) install: - make install DESTDIR="${PREFIX}" + $(MAKE) install DESTDIR="${PREFIX}" uninstall: - make uninstall + $(MAKE) uninstall diff --git a/bash/Makefile b/bash/Makefile index cf2532b..3dfa184 100644 --- a/bash/Makefile +++ b/bash/Makefile @@ -2,8 +2,8 @@ prepare: git clone https://git.savannah.gnu.org/git/bash.git cd bash bash: - make + $(MAKE) install: - make install DESTDIR="${PREFIX}" + $(MAKE) install DESTDIR="${PREFIX}" uninstall: - make uninstall + $(MAKE) uninstall diff --git a/binutils/Makefile b/binutils/Makefile index 4bb8f11..4e15894 100644 --- a/binutils/Makefile +++ b/binutils/Makefile @@ -2,7 +2,7 @@ prepare: wget -O binutils.tar.gz https://mirrors.nav.ro/gnu/binutils/binutils-2.10.1.tar.gz tar -xf binutils.tar.gz cd binutils -make: +$(MAKE): @../configure --prefix=/usr \ --enable-gold \ --enable-ld=default \ @@ -11,8 +11,8 @@ make: --disable-werror \ --enable-64-bit-bfd \ --with-system-zlib - make tooldir=${PREFIX}/usr + $(MAKE) tooldir=${PREFIX}/usr install: - make install tooldir=${PREFIX}/usr DESTDIR="${PREFIX}" + $(MAKE) install tooldir=${PREFIX}/usr DESTDIR="${PREFIX}" uninstall: - make uninstall + $(MAKE) uninstall diff --git a/bison/Makefile b/bison/Makefile index 62e706e..c59e1ed 100644 --- a/bison/Makefile +++ b/bison/Makefile @@ -2,10 +2,10 @@ prepare: wget -O bison.tar.gz https://mirrors.nav.ro/gnu/bison/bison-1.25.tar.gz tar -xf bison.tar.gz cd bison -make: +$(MAKE): @./configure --prefix=/usr - make + $(MAKE) install: - make install DESTDIR="${PREFIX}" + $(MAKE) install DESTDIR="${PREFIX}" uninstall: - make uninstall + $(MAKE) uninstall diff --git a/busybox/Makefile b/busybox/Makefile index f85d470..144cbb0 100644 --- a/busybox/Makefile +++ b/busybox/Makefile @@ -2,10 +2,10 @@ prepare: git clone git://busybox.net/busybox.git cd busybox busybox: - make defconfig - make + $(MAKE) defconfig + $(MAKE) install: - make install DESTDIR="${PREFIX}" + $(MAKE) install DESTDIR="${PREFIX}" busybox --install uninstall: - make uninstall + $(MAKE) uninstall diff --git a/bzip2/Makefile b/bzip2/Makefile index 28519ee..cdce70d 100644 --- a/bzip2/Makefile +++ b/bzip2/Makefile @@ -1,14 +1,14 @@ prepare: git clone https://www.sourceware.org/pub/bzip2/bzip2-latest.tar.gz bzip2 cd bzip2 -make: - make -f Makefile-libbz2_so - make clean - make +$(MAKE): + $(MAKE) -f Makefile-libbz2_so + $(MAKE) clean + $(MAKE) install: - make PREFIX=${PREFIX}/tools install + $(MAKE) PREFIX=${PREFIX}/tools install cp -v bzip2-shared ${PREFIX}/tools/bin/bzip2 cp -av libbz2.so* ${PREFIX}/tools/lib ln -sv libbz2.so.1.0 ${PREFIX}/tools/lib/libbz2.so uninstall: - make uninstall + $(MAKE) uninstall diff --git a/curl/Makefile b/curl/Makefile index e7dd4b9..987172e 100644 --- a/curl/Makefile +++ b/curl/Makefile @@ -2,10 +2,10 @@ prepare: wget -O curl.tar.gz https://curl.se/download/curl-7.77.0.tar.gz tar -xf curl.tar.gz cd curl -make: +$(MAKE): @./configure --prefix=/usr --with-openssl - make + $(MAKE) install: - make install DESTDIR="${PREFIX}" + $(MAKE) install DESTDIR="${PREFIX}" uninstall: - make uninstall + $(MAKE) uninstall diff --git a/flex/Makefile b/flex/Makefile index ba31eb0..f6ea3d4 100644 --- a/flex/Makefile +++ b/flex/Makefile @@ -2,15 +2,15 @@ prepare: wget -O flex.tar.gz https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz tar -xf flex.tar.gz cd flex -make: +$(MAKE): @./configure \ --prefix=/usr \ ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes - make + $(MAKE) install: - make install DESTDIR="${PREFIX}" + $(MAKE) install DESTDIR="${PREFIX}" ln -s flex "$1/usr/bin/lex" uninstall: - make uninstall + $(MAKE) uninstall diff --git a/gcc/Makefile b/gcc/Makefile index bf6c04a..4db21f1 100644 --- a/gcc/Makefile +++ b/gcc/Makefile @@ -7,9 +7,9 @@ gcc: mkdir build cd build ./configure --prefix=${PREFIX}/usr --enable-languages=c,c++,d,fortran,go,objc,obj-c++ - make + $(MAKE) install: - make install DESTDIR="${PREFIX}" + $(MAKE) install DESTDIR="${PREFIX}" ln -s gcc "$1/usr/bin/cc" install -Dm755 ../c99 "$1/usr/bin/c99" uninstall: diff --git a/git/Makefile b/git/Makefile index 63d92d5..5c06c15 100644 --- a/git/Makefile +++ b/git/Makefile @@ -2,8 +2,8 @@ prepare: git clone git://git.kernel.org/pub/scm/git/git.git cd git git: - make + $(MAKE) install: - make install DESTDIR="${PREFIX}" + $(MAKE) install DESTDIR="${PREFIX}" uninstall: - make uninstall + $(MAKE) uninstall diff --git a/gnuzip/Makefile b/gnuzip/Makefile deleted file mode 100644 index 55469ff..0000000 --- a/gnuzip/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -prepare: - git clone https://git.savannah.gnu.org/git/gzip.git - cd gzip -make: - ./configure --prefix=${PREFIX}/usr --host=$LFS_TGT - make -install: - make DESTDIR=$LFS install -uninstall: - make uninstall diff --git a/gzip/Makefile b/gzip/Makefile index 3507ef4..91b932f 100644 --- a/gzip/Makefile +++ b/gzip/Makefile @@ -1,11 +1,11 @@ prepare: git clone https://git.savannah.gnu.org/git/gzip.git/ cd gzip -make: +$(MAKE): ./configure --prefix=$prefix/usr --host=$LFS_TGT - make CC="${CC:-cc} -static" + $(MAKE) CC="${CC:-cc} -static" install: - make DESTDIR=$LFS install + $(MAKE) DESTDIR=$LFS install install -Dm755 pigz "$1/usr/bin/pigz" install -Dm755 unpigz "$1/usr/bin/unpigz" install -Dm644 pigz.1 "$1/usr/share/man/man1/pigz.1" diff --git a/hummingbird/Makefile b/hummingbird/Makefile index 28790e9..0f44264 100644 --- a/hummingbird/Makefile +++ b/hummingbird/Makefile @@ -5,10 +5,10 @@ prepare: wget https://git.hippoz.xyz/alnux/repo/src/branch/master/hummingbird/payload/usr/lib/hummingbird/interlude wget https://git.hippoz.xyz/alnux/repo/src/branch/master/hummingbird/payload/usr/lib/hummingbird/shutdown wget https://git.hippoz.xyz/alnux/repo/src/branch/master/hummingbird/payload/usr/lib/hummingbird/tty -make: - make +$(MAKE): + $(MAKE) install: - make install DESTDIR="${PREFIX}" + $(MAKE) install DESTDIR="${PREFIX}" mv fs ${PREFIX}/usr/bin/hummingbird/ mv interlude ${PREFIX}/usr/bin/hummingbird/ diff --git a/libc/Makefile b/libc/Makefile index a48450c..e5268c4 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -2,8 +2,8 @@ prepare: git clone https://sourceware.org/git/glibc.git cd glibc libc: - make + $(MAKE) install: - make install DESTDIR="${PREFIX}" + $(MAKE) install DESTDIR="${PREFIX}" uninstall: - make uninstall + $(MAKE) uninstall diff --git a/libtool/Makefile b/libtool/Makefile index 065219b..d5129d4 100644 --- a/libtool/Makefile +++ b/libtool/Makefile @@ -1,11 +1,11 @@ prepare: git clone git://git.savannah.gnu.org/libtool.git cd libtool -make: +$(MAKE): ./configure --prefix=${PREFIX}/usr - make - make check + $(MAKE) + $(MAKE) check install: - make install + $(MAKE) install uninstall: - make uninstall + $(MAKE) uninstall diff --git a/m4/Makefile b/m4/Makefile index f6c3f24..c9ccfe4 100644 --- a/m4/Makefile +++ b/m4/Makefile @@ -1,11 +1,11 @@ prepare: git clone http://git.savannah.gnu.org/r/m4.git cd m4 -make: +$(MAKE): export CFLAGS="$CFLAGS -static" ./configure - make + $(MAKE) install: - make install DESTDIR="${PREFIX}" + $(MAKE) install DESTDIR="${PREFIX}" uninstall: - make uninstall + $(MAKE) uninstall diff --git a/make/Makefile b/make/Makefile index 9a2a0b4..f6c617d 100644 --- a/make/Makefile +++ b/make/Makefile @@ -1,8 +1,8 @@ prepare: - git clone https://git.savannah.gnu.org/git/make.git - cd make -make: + git clone https://git.savannah.gnu.org/git/$(MAKE).git + cd $(MAKE) +$(MAKE): ./bootstrap ./build uninstall: - rm -rf /usr/bin/make + rm -rf /usr/bin/$(MAKE) diff --git a/openssl/Makefile b/openssl/Makefile index 5ce5ffa..4a7d72b 100644 --- a/openssl/Makefile +++ b/openssl/Makefile @@ -1,16 +1,16 @@ prepare: git clone https://github.com/openssl/openssl.git cd openssl -make: +$(MAKE): ./config --prefix=${PREFIX}/usr \ --openssldir=${PREFIX}/etc/ssl \ --libdir=lib \ shared \ zlib-dynamic - make + $(MAKE) install: sed -i '/INSTALL_LIBS/s/libcrypto.a libssl.a//' Makefile - make MANSUFFIX=ssl install + $(MAKE) MANSUFFIX=ssl install mv -v /usr/share/doc/openssl /usr/share/doc/openssl-1.1.1d cp -vfr doc/* /usr/share/doc/openssl-1.1.1d uninstall: diff --git a/xorg/Makefile b/xorg/Makefile index 007313b..fef6856 100644 --- a/xorg/Makefile +++ b/xorg/Makefile @@ -16,6 +16,6 @@ xorg: --enable-xorg \ --with-sha1=libcrypto \ --with-systemd-daemon=off - make + $(MAKE) install: - make install DESTDIR="${PREFIX}" + $(MAKE) install DESTDIR="${PREFIX}" diff --git a/xztools/Makefile b/xztools/Makefile index cd6f443..c9340c5 100644 --- a/xztools/Makefile +++ b/xztools/Makefile @@ -1,12 +1,12 @@ prepare: git clone https://git.tukaani.org/xz.git cd xz -make: +$(MAKE): ./configure \ --prefix=/usr \ --disable-nls - make + $(MAKE) install: - make install DESTDIR="${PREFIX}" + $(MAKE) install DESTDIR="${PREFIX}" uninstall: - make uninstall + $(MAKE) uninstall diff --git a/zlib/Makefile b/zlib/Makefile index 7ea967f..d16aa58 100644 --- a/zlib/Makefile +++ b/zlib/Makefile @@ -1,11 +1,11 @@ prepare: git clone https://github.com/madler/zlib cd zlib -make: +$(MAKE): ./configure - make + $(MAKE) install: - make install DESTDIR="${PREFIX}" + $(MAKE) install DESTDIR="${PREFIX}" uninstall: - make uninstall + $(MAKE) uninstall diff --git a/zsh/Makefile b/zsh/Makefile index 56c4dea..451dc6b 100644 --- a/zsh/Makefile +++ b/zsh/Makefile @@ -2,8 +2,8 @@ prepare: git clone https://github.com/zsh-users/zsh.git cd zsh zsh: - make + $(MAKE) install: - make install DESTDIR="${PREFIX}" + $(MAKE) install DESTDIR="${PREFIX}" uninstall: - make uninstall + $(MAKE) uninstall