Merge branch 'sg/help-group'
* sg/help-group: Makefile: use SHELL_PATH when running generate-cmdlist.sh
This commit is contained in:
commit
a9400b01df
2
Makefile
2
Makefile
@ -1703,7 +1703,7 @@ $(BUILT_INS): git$X
|
|||||||
common-cmds.h: generate-cmdlist.sh command-list.txt
|
common-cmds.h: generate-cmdlist.sh command-list.txt
|
||||||
|
|
||||||
common-cmds.h: $(wildcard Documentation/git-*.txt)
|
common-cmds.h: $(wildcard Documentation/git-*.txt)
|
||||||
$(QUIET_GEN)./generate-cmdlist.sh command-list.txt >$@+ && mv $@+ $@
|
$(QUIET_GEN)$(SHELL_PATH) ./generate-cmdlist.sh command-list.txt >$@+ && mv $@+ $@
|
||||||
|
|
||||||
SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\
|
SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\
|
||||||
$(localedir_SQ):$(NO_CURL):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\
|
$(localedir_SQ):$(NO_CURL):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\
|
||||||
|
Loading…
Reference in New Issue
Block a user