From ffe26d810b46010daa067f1995da042f81207080 Mon Sep 17 00:00:00 2001
From: Michael Gernoth <michael@gernoth.net>
Date: Sat, 4 Jun 2022 11:34:28 +0200
Subject: [PATCH] use $(MAKE) in recursion to subdirectories

As gnu make is needed to compile micropolis, don't just directly call
make in subdirectories but use $(MAKE) instead.
---
 src/makefile    | 16 ++++++++--------
 src/tk/makefile |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/makefile b/src/makefile
index 57217b1..bed6c5a 100644
--- a/src/makefile
+++ b/src/makefile
@@ -75,10 +75,10 @@ TARFILES = \
 	micropolis-activity/Micropolis.png
 
 all:
-	cd tcl ; make all
-	cd tk ; make all
-	cd tclx ; make all
-	cd sim ; make all
+	cd tcl ; $(MAKE) all
+	cd tk ; $(MAKE) all
+	cd tclx ; $(MAKE) all
+	cd sim ; $(MAKE) all
 
 clean:
 	rm -f Micropolis.tgz
@@ -86,10 +86,10 @@ clean:
 	(cd .. ; touch junk~ ; rm -f *~)
 	touch junk~ ; rm -f *~
 	rm -rf BUILDIT
-	cd tcl ; make clean
-	cd tk ; make clean
-	cd tclx ; make clean
-	cd sim ; make clean
+	cd tcl ; $(MAKE) clean
+	cd tk ; $(MAKE) clean
+	cd tclx ; $(MAKE) clean
+	cd sim ; $(MAKE) clean
 
 install: all
 	(cd $(RES) ; rm -f sim)
diff --git a/src/tk/makefile b/src/tk/makefile
index 219063a..885b54a 100644
--- a/src/tk/makefile
+++ b/src/tk/makefile
@@ -176,7 +176,7 @@ libtk.a: $(OBJS)
 	ranlib libtk.a
 
 $(TCL_DIR)/libtcl.a:
-	cd $(TCL_DIR); make libtcl.a
+	cd $(TCL_DIR); $(MAKE) libtcl.a
 
 clean:
 	touch junk~
-- 
2.39.5