diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-02-22 06:40:25 (GMT) |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-02-22 06:40:25 (GMT) |
| commit | b5e2f805e6bdbaae629399fea92deb053f4ca7cd (patch) | |
| tree | 420f06c14d8b90a472aeea048bc400f1fed6fada /Makefile | |
| parent | afdb4be0fc48da74e8f02fe5ca22777cb2d214ed (diff) | |
| parent | 3baee1f3bf8e30f0fc67bbb1a49877bf0660fd29 (diff) | |
| download | git-b5e2f805e6bdbaae629399fea92deb053f4ca7cd.zip git-b5e2f805e6bdbaae629399fea92deb053f4ca7cd.tar.gz git-b5e2f805e6bdbaae629399fea92deb053f4ca7cd.tar.bz2 | |
Merge branch 'maint'
* maint:
git-gui: Focus insertion point at end of strings in repository chooser
git-gui: Avoid hardcoded Windows paths in Cygwin package files
git-gui: Default TCL_PATH to same location as TCLTK_PATH
git-gui: Paper bag fix error dialogs opening over the main window
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 16 insertions, 2 deletions
@@ -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 |