diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-02-20 05:59:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-02-20 05:59:56 -0800 |
| commit | b838bf1938926a7a900166136d995d86f8a00e24 (patch) | |
| tree | b6d565c3dcd2657c6a94f9e81b35ee8ebddaef9f /gitk-git/Makefile | |
| parent | a554262210b4a2ee6fa2d594e1f09f5830888c56 (diff) | |
| parent | 4a6cc6a20eeb593f1ad0f60475a9867532d7c5d5 (diff) | |
Merge branch 'master' of https://github.com/j6t/gitk
* 'master' of https://github.com/j6t/gitk:
gitk: introduce support for the Meson build system
gitk: extract script to build executable
gitk: make the "list references" default window width wider
gitk: fix arrow keys in input fields with Tcl/Tk >= 8.6
gitk: Use an external icon file on Windows
gitk: Unicode file name support
gitk(Windows): avoid inadvertently calling executables in the worktree
Diffstat (limited to 'gitk-git/Makefile')
| -rw-r--r-- | gitk-git/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gitk-git/Makefile b/gitk-git/Makefile index e1f0aff4a1..3a3c56c318 100644 --- a/gitk-git/Makefile +++ b/gitk-git/Makefile @@ -8,6 +8,7 @@ gitk_libdir ?= $(sharedir)/gitk/lib msgsdir ?= $(gitk_libdir)/msgs msgsdir_SQ = $(subst ','\'',$(msgsdir)) +SHELL_PATH ?= /bin/sh TCL_PATH ?= tclsh TCLTK_PATH ?= wish INSTALL ?= install @@ -64,9 +65,7 @@ clean:: gitk-wish: gitk GIT-TCLTK-VARS $(QUIET_GEN)$(RM) $@ $@+ && \ - sed -e '1,3s|^exec .* "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' <gitk >$@+ && \ - chmod +x $@+ && \ - mv -f $@+ $@ + $(SHELL_PATH) ./generate-tcl.sh "$(TCLTK_PATH_SQ)" "$<" "$@" $(PO_TEMPLATE): gitk $(XGETTEXT) -kmc -LTcl -o $@ gitk |