From: Junio C Hamano Date: Tue, 17 Apr 2007 10:31:47 +0000 (-0700) Subject: git-gui: Honor TCLTK_PATH if supplied X-Git-Tag: gitgui-0.7.0-rc1~16 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/845d377b2880a0c5d74f785244469ab1ac815bde?ds=inline;hp=--cc git-gui: Honor TCLTK_PATH if supplied Mimick what we do for gitk. Since you do have a source file, git-gui.sh, which is separate from the target, it should be much easier in git-gui's Makefile. Signed-off-by: Junio C Hamano Signed-off-by: Shawn O. Pearce --- 845d377b2880a0c5d74f785244469ab1ac815bde diff --git a/Makefile b/Makefile index b82789ead6..b29d7d1e68 100644 --- a/Makefile +++ b/Makefile @@ -28,6 +28,8 @@ ifndef V QUIET_BUILT_IN = @echo ' ' BUILTIN $@; endif +TCLTK_PATH ?= wish + ifeq ($(findstring $(MAKEFLAGS),s),s) QUIET_GEN = QUIET_BUILT_IN = @@ -36,10 +38,12 @@ endif DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) gitexecdir_SQ = $(subst ','\'',$(gitexecdir)) SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) +TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH)) $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh $(QUIET_GEN)rm -f $@ $@+ && \ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ + -e 's|^exec wish "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' \ -e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \ $@.sh >$@+ && \ chmod +x $@+ && \