From 05e7279156f1e9434fe60241beb6702372258e97 Mon Sep 17 00:00:00 2001
From: Wildan M <willnode@wellosoft.net>
Date: Fri, 15 Aug 2025 12:53:08 +0700
Subject: [PATCH] Fix make invocation for Podman in MacOS

---
 Makefile      |  6 +++---
 mk/ci.mk      |  4 ++--
 mk/fstools.mk |  4 ++--
 mk/prefix.mk  | 16 ++++++++--------
 mk/repo.mk    | 22 +++++++++++-----------
 5 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/Makefile b/Makefile
index cbc345cb..77642b8c 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ rebuild:
 
 clean: $(CONTAINER_TAG)
 ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) $(MAKE) $@
+	$(PODMAN_RUN) make $@
 else
 	cd cookbook && ./clean.sh
 	-rm -rf cookbook/repo
@@ -44,7 +44,7 @@ endif
 
 distclean: $(CONTAINER_TAG)
 ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) $(MAKE) $@
+	$(PODMAN_RUN) make $@
 else
 	$(MAKE) clean
 	cd cookbook && ./unfetch.sh
@@ -83,7 +83,7 @@ include mk/ci.mk
 
 env: prefix FORCE $(CONTAINER_TAG)
 ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) $(MAKE) $@
+	$(PODMAN_RUN) make $@
 else
 	export PATH="$(PREFIX_PATH):$$PATH" && \
 	bash
diff --git a/mk/ci.mk b/mk/ci.mk
index 9d7cde36..109807b1 100644
--- a/mk/ci.mk
+++ b/mk/ci.mk
@@ -24,7 +24,7 @@ minimal minimal-net server desktop demo: FORCE
 # CI packaging target
 ci-pkg: prefix $(FSTOOLS_TAG) $(CONTAINER_TAG) FORCE
 ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) $(MAKE) $@
+	$(PODMAN_RUN) make $@
 else
 	$(HOST_CARGO) build --manifest-path cookbook/Cargo.toml --release
 	$(HOST_CARGO) build --manifest-path cookbook/pkgar/Cargo.toml --release
@@ -40,7 +40,7 @@ endif
 # CI toolchain
 ci-toolchain: $(CONTAINER_TAG) FORCE
 ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) $(MAKE) $@
+	$(PODMAN_RUN) make $@
 else
 	$(MAKE) PREFIX_BINARY=0 \
 		"prefix/$(TARGET)/gcc-install.tar.gz" \
diff --git a/mk/fstools.mk b/mk/fstools.mk
index 61a85066..125b8cbf 100644
--- a/mk/fstools.mk
+++ b/mk/fstools.mk
@@ -5,7 +5,7 @@ fstools: $(FSTOOLS_TAG)
 # These tools run inside Podman if it is used, or on the host if Podman is not used
 $(FSTOOLS_TAG): cookbook installer $(CONTAINER_TAG)
 ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) $(MAKE) $@
+	$(PODMAN_RUN) make $@
 else
 	$(HOST_CARGO) build --manifest-path cookbook/Cargo.toml --release
 	$(HOST_CARGO) build --manifest-path cookbook/pkgar/Cargo.toml --release
@@ -25,7 +25,7 @@ $(HOST_FSTOOLS): installer redoxfs
 
 fstools_clean: FORCE $(CONTAINER_TAG)
 ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) $(MAKE) $@
+	$(PODMAN_RUN) make $@
 else
 	$(HOST_CARGO) clean --manifest-path cookbook/Cargo.toml
 	$(HOST_CARGO) clean --manifest-path cookbook/pkgar/Cargo.toml
diff --git a/mk/prefix.mk b/mk/prefix.mk
index 033c01d0..2aefc0fe 100644
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@@ -44,7 +44,7 @@ $(PREFIX)/relibc: $(ROOT)/relibc
 
 $(PREFIX)/relibc-install: $(PREFIX)/relibc | $(PREFIX)/rust-install $(CONTAINER_TAG)
 ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) $(MAKE) $@
+	$(PODMAN_RUN) make $@
 else
 	rm -rf "$@.partial" "$@"
 	cp -r "$(PREFIX)/rust-install" "$@.partial"
@@ -88,7 +88,7 @@ $(PREFIX)/libtool:
 
 $(PREFIX)/libtool-build: $(PREFIX)/libtool $(PREFIX)/rust-install
 ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) $(MAKE) $@
+	$(PODMAN_RUN) make $@
 else
 	rm -rf "$@.partial" "$@"
 	mkdir -p "$@.partial"
@@ -112,7 +112,7 @@ endif
 
 $(PREFIX)/sysroot: $(PREFIX)/relibc-install $(PREFIX)/libtool-build $(CONTAINER_TAG)
 ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) $(MAKE) $@
+	$(PODMAN_RUN) make $@
 else
 	rm -rf "$@"
 	cp -r "$(PREFIX)/relibc-install/" "$@"
@@ -161,7 +161,7 @@ $(PREFIX)/binutils: $(PREFIX)/binutils-$(BINUTILS_BRANCH).tar.bz2
 
 $(PREFIX)/binutils-install: $(PREFIX)/binutils $(CONTAINER_TAG)
 ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) $(MAKE) $@
+	$(PODMAN_RUN) make $@
 else
 	rm -rf "$<-build" "$@.partial" "$@"
 	mkdir -p "$<-build" "$@.partial"
@@ -197,7 +197,7 @@ $(PREFIX)/gcc: $(PREFIX)/gcc-$(GCC_BRANCH).tar.bz2
 
 $(PREFIX)/gcc-freestanding-install: $(PREFIX)/gcc | $(PREFIX)/binutils-install $(CONTAINER_TAG)
 ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) $(MAKE) $@
+	$(PODMAN_RUN) make $@
 else
 	rm -rf "$<-freestanding-build" "$@.partial" "$@"
 	mkdir -p "$<-freestanding-build"
@@ -233,7 +233,7 @@ $(PREFIX)/relibc-freestanding: $(ROOT)/relibc
 
 $(PREFIX)/relibc-freestanding-install: $(PREFIX)/relibc-freestanding | $(PREFIX_FREESTANDING_INSTALL) $(CONTAINER_TAG)
 ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) $(MAKE) $@
+	$(PODMAN_RUN) make $@
 else
 	rm -rf "$@.partial" "$@"
 	mkdir -p "$@.partial"
@@ -252,7 +252,7 @@ endif
 
 $(PREFIX)/gcc-install: $(PREFIX)/gcc | $(PREFIX)/relibc-freestanding-install $(CONTAINER_TAG)
 ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) $(MAKE) $@
+	$(PODMAN_RUN) make $@
 else
 	rm -rf "$<-build" "$@.partial" "$@"
 	mkdir -p "$<-build"
@@ -294,7 +294,7 @@ $(PREFIX)/gcc-install.tar.gz: $(PREFIX)/gcc-install
 
 $(PREFIX)/rust-install: $(ROOT)/rust/configure | $(PREFIX)/gcc-install $(PREFIX)/relibc-freestanding-install $(CONTAINER_TAG)
 ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) $(MAKE) $@
+	$(PODMAN_RUN) make $@
 else
 	rm -rf "$(PREFIX)/rust-build" "$@.partial" "$@"
 	mkdir -p "$(PREFIX)/rust-build"
diff --git a/mk/repo.mk b/mk/repo.mk
index 2cdcf404..d8f232d8 100644
--- a/mk/repo.mk
+++ b/mk/repo.mk
@@ -2,7 +2,7 @@
 
 $(BUILD)/fetch.tag: prefix $(FSTOOLS_TAG) $(FILESYSTEM_CONFIG) $(CONTAINER_TAG)
 ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) $(MAKE) $@
+	$(PODMAN_RUN) make $@
 else
 	export PATH="$(PREFIX_PATH):$$PATH" && \
 	PACKAGES="$$($(LIST_PACKAGES) $(LIST_PACKAGES_OPTS) -c $(FILESYSTEM_CONFIG))" && \
@@ -15,7 +15,7 @@ endif
 
 $(REPO_TAG): $(BUILD)/fetch.tag $(FSTOOLS_TAG) $(CONTAINER_TAG)
 ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) $(MAKE) $@
+	$(PODMAN_RUN) make $@
 else
 	export PATH="$(PREFIX_PATH):$$PATH" && \
 	export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \
@@ -32,7 +32,7 @@ endif
 # Find recipe
 find.%: $(FSTOOLS_TAG) FORCE
 ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) $(MAKE) $@
+	$(PODMAN_RUN) make $@
 else
 	export PATH="$(PREFIX_PATH):$$PATH" && \
 	export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \
@@ -45,7 +45,7 @@ comma := ,
 # Invoke clean.sh for one or more targets separated by comma
 c.%: $(FSTOOLS_TAG) FORCE
 ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) $(MAKE) $@
+	$(PODMAN_RUN) make $@
 else
 	@if echo "$*" | grep -q ','; then \
 		$(MAKE) $(foreach f,$(subst $(comma), ,$*),c.$(f)); \
@@ -60,7 +60,7 @@ endif
 # Invoke fetch.sh for one or more targets separated by comma
 f.%: $(FSTOOLS_TAG) FORCE
 ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) $(MAKE) $@
+	$(PODMAN_RUN) make $@
 else
 	@if echo "$*" | grep -q ','; then \
 		$(MAKE) $(foreach f,$(subst $(comma), ,$*),f.$(f)); \
@@ -75,7 +75,7 @@ endif
 # Invoke repo.sh for one or more targets separated by comma
 r.%: $(FSTOOLS_TAG) FORCE
 ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) $(MAKE) $@
+	$(PODMAN_RUN) make $@
 else
 	@if echo "$*" | grep -q ','; then \
 		$(MAKE) $(foreach f,$(subst $(comma), ,$*),r.$(f)); \
@@ -90,7 +90,7 @@ endif
 # Invoke unfetch.sh for one or more targets separated by comma
 u.%: $(FSTOOLS_TAG) FORCE
 ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) $(MAKE) $@
+	$(PODMAN_RUN) make $@
 else
 	@if echo "$*" | grep -q ','; then \
 		$(MAKE) $(foreach f,$(subst $(comma), ,$*),u.$(f)); \
@@ -105,7 +105,7 @@ endif
 # Invoke clean.sh, and repo.sh for one of more targets separated by comma
 cr.%: $(FSTOOLS_TAG) FORCE
 ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) $(MAKE) $@
+	$(PODMAN_RUN) make $@
 else
 	$(MAKE) c.$*
 	$(MAKE) r.$*
@@ -114,7 +114,7 @@ endif
 # Invoke unfetch.sh, clean.sh, and repo.sh for one or more targets separated by comma
 ucr.%: $(FSTOOLS_TAG) FORCE
 ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) $(MAKE) $@
+	$(PODMAN_RUN) make $@
 else
 	$(MAKE) u.$*
 	$(MAKE) cr.$*
@@ -123,7 +123,7 @@ endif
 # Invoke unfetch.sh and clean.sh for one or more targets separated by comma
 uc.%: $(FSTOOLS_TAG) FORCE
 ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) $(MAKE) $@
+	$(PODMAN_RUN) make $@
 else
 	$(MAKE) u.$*
 	$(MAKE) c.$*
@@ -132,7 +132,7 @@ endif
 # Invoke unfetch, clean.sh and fetch.sh for one or more targets separated by comma
 ucf.%: $(FSTOOLS_TAG) FORCE
 ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) $(MAKE) $@
+	$(PODMAN_RUN) make $@
 else
 	$(MAKE) uc.$*
 	$(MAKE) f.$*