diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-23 11:49:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-23 11:49:34 -0800 |
| commit | 923d44aeb7cb6d21eeb459fdc1b58137e37c2b1c (patch) | |
| tree | 324f50710997113250f1c24abf043eceb2c2b883 /git-gui/Makefile | |
| parent | 0d2dd191cdfa3f1795c4df60a5cfb0f7e58c097a (diff) | |
| parent | 31e0b2ca81ad985a8768c33c0aba547a51d05277 (diff) | |
| download | git-923d44aeb7cb6d21eeb459fdc1b58137e37c2b1c.tar.xz | |
Sync with 1.5.4.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/Makefile')
| -rw-r--r-- | git-gui/Makefile | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/git-gui/Makefile b/git-gui/Makefile index 081d7550a7..01e0a46ba5 100644 --- a/git-gui/Makefile +++ b/git-gui/Makefile @@ -92,8 +92,12 @@ ifndef V REMOVE_F1 = && echo ' ' REMOVE `basename "$$dst"` && $(RM_RF) "$$dst" endif -TCL_PATH ?= tclsh TCLTK_PATH ?= wish +ifeq (./,$(dir $(TCLTK_PATH))) + TCL_PATH ?= $(subst wish,tclsh,$(TCLTK_PATH)) +else + TCL_PATH ?= $(dir $(TCLTK_PATH))$(notdir $(subst wish,tclsh,$(TCLTK_PATH))) +endif ifeq ($(uname_S),Darwin) TKFRAMEWORK = /Library/Frameworks/Tk.framework/Resources/Wish.app @@ -127,7 +131,17 @@ GITGUI_MACOSXAPP := ifeq ($(uname_O),Cygwin) GITGUI_SCRIPT := `cygpath --windows --absolute "$(GITGUI_SCRIPT)"` - gg_libdir_sed_in := $(shell cygpath --windows --absolute "$(gg_libdir)") + + # Is this a Cygwin Tcl/Tk binary? If so it knows how to do + # POSIX path translation just like cygpath does and we must + # keep libdir in POSIX format so Cygwin packages of git-gui + # work no matter where the user installs them. + # + ifeq ($(shell echo 'puts [file normalize /]' | '$(TCL_PATH_SQ)'),$(shell cygpath --mixed --absolute /)) + gg_libdir_sed_in := $(gg_libdir) + else + gg_libdir_sed_in := $(shell cygpath --windows --absolute "$(gg_libdir)") + endif else ifeq ($(exedir),$(gg_libdir)) GITGUI_RELATIVE := 1 |