From c54e2648dcc411aa13909f6a1e366d694bfed097 Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Tue, 7 Dec 2021 04:35:42 -0800 Subject: [PATCH] Set SHELL=/bin/sh for macOS in Makefiles --- CHANGES | 1 + Makefile | 6 +++--- Makefile.ship | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index ded97cc..a5d8485 100644 --- a/CHANGES +++ b/CHANGES @@ -26,6 +26,7 @@ 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. + Using /bin/sh on macOS due to how zsh treats globs by default. The following are the changes from calc version 2.14.0.9 to 2.14.0.10: diff --git a/Makefile b/Makefile index b1d5830..55fefb4 100644 --- a/Makefile +++ b/Makefile @@ -65,13 +65,13 @@ endif # # On some systems such as macOS, the bash shell is very # far behind to the point where is cannot be depended on. -# On such systems, the zsh may be a much better alternative +# On such systems, the sh may be a much better alternative # shell for this Makefile to use: # -# SHELL= /bin/zsh +# SHELL= /bin/sh # ifeq ($(target),Darwin) -SHELL= /bin/zsh +SHELL= /bin/sh else SHELL= /bin/bash endif diff --git a/Makefile.ship b/Makefile.ship index 148c970..11df15f 100644 --- a/Makefile.ship +++ b/Makefile.ship @@ -48,15 +48,15 @@ # # On some systems such as macOS, the bash shell is very # far behind to the point where is cannot be depended on. -# On such systems, the zsh may be a much better alternative +# On such systems, the sh may be a much better alternative # shell for this Makefile to use: # -# SHELL= /bin/zsh +# SHELL= /bin/sh # SHELL= /bin/bash #if 0 /* start of skip for non-Gnu makefiles */ ifeq ($(target),Darwin) -SHELL:= /bin/zsh +SHELL:= /bin/sh endif #endif /* end of skip for non-Gnu makefiles */