[PATCH 1/4] Use $(SHELL_PATH) instead of sh in Makefile.
- From
- lufia via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Aug 6, 2020, 01:05 UTC
- Message-ID
- <1f63b4fc7c2ae1970d7226bbf0b66901528fb9d8.1596675905.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.694.git.1596675905.gitgitgadget@gmail.com>
From: lufia <lufia@lufia.org>
In the not POSIX environment, like Plan 9, sh might not be looked up in the directories named by the $PATH.
Signed-off-by: lufia <lufia@lufia.org> --- config.mak.uname | 12 ++++++------ git-gui/Makefile | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/config.mak.uname b/config.mak.uname index c7eba69e54..f3eb2b91a2 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -4,12 +4,12 @@ # Microsoft's Safe Exception Handling in libraries (such as zlib). # Typically required for VS2013+/32-bit compilation on Vista+ versions. -uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') -uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') -uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') -uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') -uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not') -uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not') +uname_S := $(shell $(SHELL_PATH) -c 'uname -s 2>/dev/null || echo not') +uname_M := $(shell $(SHELL_PATH) -c 'uname -m 2>/dev/null || echo not') +uname_O := $(shell $(SHELL_PATH) -c 'uname -o 2>/dev/null || echo not') +uname_R := $(shell $(SHELL_PATH) -c 'uname -r 2>/dev/null || echo not') +uname_P := $(shell $(SHELL_PATH) -c 'uname -p 2>/dev/null || echo not') +uname_V := $(shell $(SHELL_PATH) -c 'uname -v 2>/dev/null || echo not') ifdef MSVC # avoid the MingW and Cygwin configuration sections diff --git a/git-gui/Makefile b/git-gui/Makefile index f10caedaa7..c47603c397 100644 --- a/git-gui/Makefile +++ b/git-gui/Makefile @@ -11,9 +11,9 @@ GIT-VERSION-FILE: FORCE @$(SHELL_PATH) ./GIT-VERSION-GEN -include GIT-VERSION-FILE -uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') -uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') -uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') +uname_S := $(shell $(SHELL_PATH) -c 'uname -s 2>/dev/null || echo not') +uname_O := $(shell $(SHELL_PATH) -c 'uname -o 2>/dev/null || echo not') +uname_R := $(shell $(SHELL_PATH) -c 'uname -r 2>/dev/null || echo not') SCRIPT_SH = git-gui.sh GITGUI_MAIN := git-gui
-- gitgitgadget