From 2023175fcc19d91d48dfb2cea3991ce12c9a2b11 Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Tue, 7 Dec 2021 04:45:23 -0800 Subject: [PATCH] Change how SHELL is set for all calc Makefiles Using /bin/sh on macOS due to how zsh treats globs by default. --- Makefile.ship | 1 + cal/Makefile | 14 +++++++++----- cscript/Makefile | 14 +++++++++----- custom/Makefile | 1 + custom/Makefile.head | 1 + help/Makefile | 14 +++++++++----- 6 files changed, 30 insertions(+), 15 deletions(-) diff --git a/Makefile.ship b/Makefile.ship index 11df15f..5c22ab3 100644 --- a/Makefile.ship +++ b/Makefile.ship @@ -54,6 +54,7 @@ # SHELL= /bin/sh # SHELL= /bin/bash +#SHELL= /bin/sh #if 0 /* start of skip for non-Gnu makefiles */ ifeq ($(target),Darwin) SHELL:= /bin/sh diff --git a/cal/Makefile b/cal/Makefile index f6fc2c9..ff9f3ac 100644 --- a/cal/Makefile +++ b/cal/Makefile @@ -48,14 +48,18 @@ # # 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/sh -#SHELL= /bin/bash -#SHELL= /bin/zsh +SHELL= /bin/bash +#SHELL= /bin/sh +#if 0 /* start of skip for non-Gnu makefiles */ +ifeq ($(target),Darwin) +SHELL:= /bin/zsh +endif +#endif /* end of skip for non-Gnu makefiles */ #### diff --git a/cscript/Makefile b/cscript/Makefile index 9b4f6bd..021b713 100644 --- a/cscript/Makefile +++ b/cscript/Makefile @@ -47,14 +47,18 @@ # # 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/sh -#SHELL= /bin/bash -#SHELL= /bin/zsh +SHELL= /bin/bash +#SHELL= /bin/sh +#if 0 /* start of skip for non-Gnu makefiles */ +ifeq ($(target),Darwin) +SHELL:= /bin/zsh +endif +#endif /* end of skip for non-Gnu makefiles */ #### diff --git a/custom/Makefile b/custom/Makefile index 5bc7872..88d5cd1 100644 --- a/custom/Makefile +++ b/custom/Makefile @@ -73,6 +73,7 @@ # SHELL= /bin/zsh # SHELL= /bin/bash +#SHELL= /bin/sh #if 0 /* start of skip for non-Gnu makefiles */ ifeq ($(target),Darwin) SHELL:= /bin/zsh diff --git a/custom/Makefile.head b/custom/Makefile.head index e65c9af..ac8417b 100644 --- a/custom/Makefile.head +++ b/custom/Makefile.head @@ -73,6 +73,7 @@ # SHELL= /bin/zsh # SHELL= /bin/bash +#SHELL= /bin/sh #if 0 /* start of skip for non-Gnu makefiles */ ifeq ($(target),Darwin) SHELL:= /bin/zsh diff --git a/help/Makefile b/help/Makefile index 1f11aa9..b9ca3f2 100644 --- a/help/Makefile +++ b/help/Makefile @@ -48,14 +48,18 @@ # # 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/sh -#SHELL= /bin/bash -#SHELL= /bin/zsh +SHELL= /bin/bash +#SHELL= /bin/sh +#if 0 /* start of skip for non-Gnu makefiles */ +ifeq ($(target),Darwin) +SHELL:= /bin/zsh +endif +#endif /* end of skip for non-Gnu makefiles */ ####