From faf40b71498ea576e7fe52175275395348500cea Mon Sep 17 00:00:00 2001
From: Landon Curt Noll <github-mail@asthe.com>
Date: Tue, 7 Dec 2021 04:18:39 -0800
Subject: [PATCH] Fixed how SHELL is set in Makefiles, fix make depend on linux

---
 CHANGES              |  2 ++
 Makefile.ship        | 18 ++++++++----------
 custom/Makefile      | 16 +++++++---------
 custom/Makefile.head | 11 +++++++----
 custom/Makefile.tail |  5 -----
 5 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/CHANGES b/CHANGES
index 19de1b6..ded97cc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -25,6 +25,8 @@ The following are the changes from calc version 2.14.0.11 to date:
 
     Fixed depend rule for custom/Makefile.
 
+    Fixed how Makefile variable SHELL is set on macOS vs. linux.
+
 
 The following are the changes from calc version 2.14.0.9 to 2.14.0.10:
 
diff --git a/Makefile.ship b/Makefile.ship
index 56f793b..148c970 100644
--- a/Makefile.ship
+++ b/Makefile.ship
@@ -53,9 +53,12 @@
 #
 #	SHELL= /bin/zsh
 #
-SHELL= /bin/sh
-#SHELL= /bin/bash
-#SHELL= /bin/zsh
+SHELL= /bin/bash
+#if 0	/* start of skip for non-Gnu makefiles */
+ifeq ($(target),Darwin)
+SHELL:= /bin/zsh
+endif
+#endif	/* end of skip for non-Gnu makefiles */
 
 
 #if 0	/* start of skip for non-Gnu makefiles */
@@ -1255,7 +1258,7 @@ LANG= C
 LDCONFIG= ldconfig
 LN= ln
 MAKE= make
-MAKEDEPEND= /usr/bin/makedepend
+MAKEDEPEND= makedepend
 MKDIR= mkdir
 MV= mv
 PWDCMD= pwd
@@ -4202,11 +4205,6 @@ depend: hsrc custom/Makefile
 	else \
 	    ${TRUE}; \
 	fi
-	${Q} if [ ! -x "${MAKEDEPEND}" ]; then \
-		echo "makedepend command not found: ${MAKEDEPEND}"; \
-		echo "aborting depend rule"; \
-		exit 1; \
-	fi
 	${V} echo '=-=-=-=-= Invoking depend rule for cscript =-=-=-=-='
 	${Q} cd cscript; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} depend
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
@@ -5101,7 +5099,7 @@ endif
 #if 0	/* start of skip for non-Gnu makefiles */
 ifdef ALLOW_CUSTOM
 #endif	/* end of skip for non-Gnu makefiles */
-	${V} echo 'XXX =-=-=-=-= Invoking $@ rule for custom =-=-=-=-='
+	${V} echo '=-=-=-=-= Invoking $@ rule for custom =-=-=-=-='
 	${Q} cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} install
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 #if 0	/* start of skip for non-Gnu makefiles */
diff --git a/custom/Makefile b/custom/Makefile
index 59502c6..5bc7872 100644
--- a/custom/Makefile
+++ b/custom/Makefile
@@ -72,9 +72,12 @@
 #
 #	SHELL= /bin/zsh
 #
-SHELL= /bin/sh
-#SHELL= /bin/bash
-#SHELL= /bin/zsh
+SHELL= /bin/bash
+#if 0	/* start of skip for non-Gnu makefiles */
+ifeq ($(target),Darwin)
+SHELL:= /bin/zsh
+endif
+#endif	/* end of skip for non-Gnu makefiles */
 
 
 # PREFIX - Top level location for calc
@@ -515,7 +518,7 @@ FMT= fmt
 GREP= egrep
 LN= ln
 MAKE= make
-MAKEDEPEND= /usr/bin/makedepend
+MAKEDEPEND= makedepend
 MKDIR= mkdir
 MV= mv
 RM= rm
@@ -1303,11 +1306,6 @@ depend:
 	else \
 	    ${TRUE}; \
 	fi
-	${Q} if [ ! -x "${MAKEDEPEND}" ]; then \
-		echo "makedepend command not found: ${MAKEDEPEND}"; \
-		echo "aborting depend rule"; \
-		exit 1; \
-	fi
 	${Q} echo forming custom/skel
 	${Q} ${RM} -rf skel
 	${Q} ${MKDIR} -p skel
diff --git a/custom/Makefile.head b/custom/Makefile.head
index 6f1e543..e65c9af 100644
--- a/custom/Makefile.head
+++ b/custom/Makefile.head
@@ -72,9 +72,12 @@
 #
 #	SHELL= /bin/zsh
 #
-SHELL= /bin/sh
-#SHELL= /bin/bash
-#SHELL= /bin/zsh
+SHELL= /bin/bash
+#if 0	/* start of skip for non-Gnu makefiles */
+ifeq ($(target),Darwin)
+SHELL:= /bin/zsh
+endif
+#endif	/* end of skip for non-Gnu makefiles */
 
 
 # PREFIX - Top level location for calc
@@ -515,7 +518,7 @@ FMT= fmt
 GREP= egrep
 LN= ln
 MAKE= make
-MAKEDEPEND= /usr/bin/makedepend
+MAKEDEPEND= makedepend
 MKDIR= mkdir
 MV= mv
 RM= rm
diff --git a/custom/Makefile.tail b/custom/Makefile.tail
index 0e94b5c..fcac0cd 100644
--- a/custom/Makefile.tail
+++ b/custom/Makefile.tail
@@ -193,11 +193,6 @@ depend:
 	else \
 	    ${TRUE}; \
 	fi
-	${Q} if [ ! -x "${MAKEDEPEND}" ]; then \
-		echo "makedepend command not found: ${MAKEDEPEND}"; \
-		echo "aborting depend rule"; \
-		exit 1; \
-	fi
 	${Q} echo forming custom/skel
 	${Q} ${RM} -rf skel
 	${Q} ${MKDIR} -p skel