From bbba8d6f954305a465e85fc9298a9edd69538b4e Mon Sep 17 00:00:00 2001
From: Brian Callahan <dodonpachi-github@mailinator.com>
Date: Sun, 25 May 2014 16:25:15 -0400
Subject: [PATCH] Remove all hardcoded make commands, changing them to ${MAKE}.
 This is a first step towards being able to build RetroBSD on *BSD.

---
 src/cmd/smux/Makefile   | 10 +++++-----
 src/cmd/tip/Makefile    |  8 ++++----
 src/cmd/uucp/Makefile   |  4 ++--
 src/games/Makefile      |  4 ++--
 src/libc/Makefile       |  6 +++---
 src/libc/mips/Makefile  |  8 ++++----
 src/libtermlib/Makefile |  2 +-
 src/share/Makefile      |  6 +++---
 sys/pic32/Makefile      |  4 ++--
 9 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/cmd/smux/Makefile b/src/cmd/smux/Makefile
index 24ba798..1adc829 100644
--- a/src/cmd/smux/Makefile
+++ b/src/cmd/smux/Makefile
@@ -1,10 +1,10 @@
 all:
-	make -C retro
-	make -C linux
+	${MAKE} -C retro
+	${MAKE} -C linux
 
 install:
-	make -C retro install
+	${MAKE} -C retro install
 
 clean:
-	make -C retro clean
-	make -C linux clean
+	${MAKE} -C retro clean
+	${MAKE} -C linux clean
diff --git a/src/cmd/tip/Makefile b/src/cmd/tip/Makefile
index bbccde6..ff6cde3 100644
--- a/src/cmd/tip/Makefile
+++ b/src/cmd/tip/Makefile
@@ -68,18 +68,18 @@ acutab.o: acutab.c
 log.o remote.o: Makefile
 
 aculib: FRC
-	cd aculib; make ${MFLAGS}
+	cd aculib; ${MAKE} ${MFLAGS}
 
 clean: FRC
 	rm -f ${OBJS} core tip tip.elf tip.dis
-	cd aculib; make ${MFLAGS} clean
+	cd aculib; ${MAKE} ${MFLAGS} clean
 
 depend: FRC
 	mkdep ${CFLAGS} ${SRCS}
-	cd aculib; make ${MFLAGS} depend
+	cd aculib; ${MAKE} ${MFLAGS} depend
 
 install: aculib tip
-	cd aculib; make ${MFLAGS} install
+	cd aculib; ${MAKE} ${MFLAGS} install
 	cp tip ${DESTDIR}/bin/tip
 	rm -f ${DESTDIR}/bin/cu
 	touch ${DESTDIR}/${ADM}/aculog
diff --git a/src/cmd/uucp/Makefile b/src/cmd/uucp/Makefile
index 3923691..fde7bb8 100644
--- a/src/cmd/uucp/Makefile
+++ b/src/cmd/uucp/Makefile
@@ -44,7 +44,7 @@ SUBDIRS=C. D.${HOSTNAME}X D.${HOSTNAME} D. X. TM.
 all:	libacu $(ALL)
 
 libacu:
-	cd aculib && make
+	cd aculib && ${MAKE}
 
 
 uuencode: uuencode.o
@@ -136,7 +136,7 @@ install: uuencode uuencode
 
 clean:
 	rm -f *.o $(ALL) libuucp.a *.dis *.elf
-	cd aculib; make ${MFLAGS} clean
+	cd aculib; ${MAKE} ${MFLAGS} clean
 
 depend:
 	mkdep ${CFLAGS} *.c
diff --git a/src/games/Makefile b/src/games/Makefile
index e20f0dc..62d2ae2 100644
--- a/src/games/Makefile
+++ b/src/games/Makefile
@@ -42,7 +42,7 @@ FRC:
 
 install:        $(STD) $(NSTD)
 		-for i in $(SUBDIR); do \
-			make -C $$i $(MFLAGS) DESTDIR=$(DESTDIR) install; done
+			${MAKE} -C $$i $(MFLAGS) DESTDIR=$(DESTDIR) install; done
 		-for i in $(STD) $(NSTD); do \
 			install $$i $(DESTDIR)/games/$$i; done
 		-for i in *.6; do \
@@ -52,7 +52,7 @@ install:        $(STD) $(NSTD)
 
 clean:
 		rm -f a.out core *.s *.o *.dis *.elf $(STD) $(NSTD)
-		-for i in $(SUBDIR); do make -C $$i $(MFLAGS) clean; done
+		-for i in $(SUBDIR); do ${MAKE} -C $$i $(MFLAGS) clean; done
 
 # Files listed in $(NSTD) have explicit make lines given below.
 
diff --git a/src/libc/Makefile b/src/libc/Makefile
index 3d0c081..44cf99f 100644
--- a/src/libc/Makefile
+++ b/src/libc/Makefile
@@ -40,7 +40,7 @@ all:            ../libc.a
 		rm -rf tmp
 
 ${ALL}:		FRC
-		cd $@; make ${MFLAGS} DEFS="${DEFS}"
+		cd $@; ${MAKE} ${MFLAGS} DEFS="${DEFS}"
 
 FRC:
 
@@ -51,9 +51,9 @@ install:	../libc.a
 
 clean:
 		for i in ${ALL}; \
-			do (cd $$i; make ${MFLAGS} clean); done
+			do (cd $$i; ${MAKE} ${MFLAGS} clean); done
 		rm -rf tmp *.a *~
 
 depend:
 		for i in ${ALL}; \
-			do (cd $$i; make ${MFLAGS} DEFS="${DEFS}" depend); done
+			do (cd $$i; ${MAKE} ${MFLAGS} DEFS="${DEFS}" depend); done
diff --git a/src/libc/mips/Makefile b/src/libc/mips/Makefile
index 87fb931..a62fcda 100644
--- a/src/libc/mips/Makefile
+++ b/src/libc/mips/Makefile
@@ -17,19 +17,19 @@ mips.a:		${ALL}
 		rm -rf tmp
 
 ${ALL}:	FRC
-	cd $@; make ${MFLAGS} DEFS=${DEFS}
+	cd $@; ${MAKE} ${MFLAGS} DEFS=${DEFS}
 
 FRC:
 
 tags:
 		for i in ${ALL}; do \
-			(cd $$i; make ${MFLAGS} TAGSFILE=../${TAGSFILE} tags); \
+			(cd $$i; ${MAKE} ${MFLAGS} TAGSFILE=../${TAGSFILE} tags); \
 		done
 
 clean:
-		for i in ${ALL}; do (cd $$i; make ${MFLAGS} clean); done
+		for i in ${ALL}; do (cd $$i; ${MAKE} ${MFLAGS} clean); done
 		rm -rf *.a tmp *~
 
 depend:
 		for i in ${ALL}; do \
-			(cd $$i; make ${MFLAGS} DEFS=${DEFS} depend); done
+			(cd $$i; ${MAKE} ${MFLAGS} DEFS=${DEFS} depend); done
diff --git a/src/libtermlib/Makefile b/src/libtermlib/Makefile
index 386f77b..5614e26 100644
--- a/src/libtermlib/Makefile
+++ b/src/libtermlib/Makefile
@@ -26,7 +26,7 @@ all:    ../libtermcap.a termcap
 .PHONY: termcap
 
 termcap:
-	cd termcap && make
+	cd termcap && ${MAKE}
 
 ../libtermcap.a: ${OBJS}
 	$(AR) cr ../libtermcap.a ${OBJS}
diff --git a/src/share/Makefile b/src/share/Makefile
index bd0a113..34ce823 100644
--- a/src/share/Makefile
+++ b/src/share/Makefile
@@ -11,14 +11,14 @@ SUBDIR		= misc
 all:		${SUBDIR}
 
 ${SUBDIR}: 	FRC
-		cd $@; make ${MFLAGS}
+		cd $@; ${MAKE} ${MFLAGS}
 
 FRC:
 
 install: 	FRC
 		-for i in ${SUBDIR}; do \
-			(cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
+			(cd $$i; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} install); done
 
 clean:
 		rm -f *~
-		for i in ${SUBDIR}; do (cd $$i; make ${MFLAGS} clean); done
+		for i in ${SUBDIR}; do (cd $$i; ${MAKE} ${MFLAGS} clean); done
diff --git a/sys/pic32/Makefile b/sys/pic32/Makefile
index 193371e..e82501f 100644
--- a/sys/pic32/Makefile
+++ b/sys/pic32/Makefile
@@ -10,12 +10,12 @@ SUBDIR		= baremetal dip duinomite duinomite-uart duinomite-e \
 default:
 
 all:
-		-for i in $(SUBDIR); do make -C $$i all; done
+		-for i in $(SUBDIR); do ${MAKE} -C $$i all; done
 
 install:
 
 clean:
-		-for i in $(SUBDIR); do make -C $$i clean; done
+		-for i in $(SUBDIR); do ${MAKE} -C $$i clean; done
 		find .. -name \*~ | xargs rm -f
 
 reconfig: