drygdryg/calc
1
0
Fork 0
mirror of https://github.com/lcn2/calc.git synced 2025-08-16 01:03:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Set SHELL=/bin/sh for macOS in Makefiles

Browse Source
This commit is contained in:
Landon Curt Noll
2021-12-07 04:35:42 -08:00
parent faf40b7149
commit c54e2648dc
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@@ -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 depend rule for custom/Makefile.
Fixed how Makefile variable SHELL is set on macOS vs. linux. 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: The following are the changes from calc version 2.14.0.9 to 2.14.0.10:

6
Makefile
View File

@@ -65,13 +65,13 @@ endif
# #
# On some systems such as macOS, the bash shell is very # On some systems such as macOS, the bash shell is very
# far behind to the point where is cannot be depended on. # 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 for this Makefile to use:
# #
# SHELL= /bin/zsh # SHELL= /bin/sh
# #
ifeq ($(target),Darwin) ifeq ($(target),Darwin)
SHELL= /bin/zsh SHELL= /bin/sh
else else
SHELL= /bin/bash SHELL= /bin/bash
endif endif

6
Makefile.ship
View File

@@ -48,15 +48,15 @@
# #
# On some systems such as macOS, the bash shell is very # On some systems such as macOS, the bash shell is very
# far behind to the point where is cannot be depended on. # 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 for this Makefile to use:
# #
# SHELL= /bin/zsh # SHELL= /bin/sh
# #
SHELL= /bin/bash SHELL= /bin/bash
#if 0 /* start of skip for non-Gnu makefiles */ #if 0 /* start of skip for non-Gnu makefiles */
ifeq ($(target),Darwin) ifeq ($(target),Darwin)
SHELL:= /bin/zsh SHELL:= /bin/sh
endif endif
#endif /* end of skip for non-Gnu makefiles */ #endif /* end of skip for non-Gnu makefiles */