diff options
author | Shawn O. Pearce <spearce@spearce.org> | 2007-04-15 04:34:28 (GMT) |
---|---|---|
committer | Shawn O. Pearce <spearce@spearce.org> | 2007-04-15 04:34:28 (GMT) |
commit | d025d1e322c715ecf7fa7c10ce9e6b4a1be982d0 (patch) | |
tree | 245b314045227539d17e6675a785f72fa5ad2f24 /Makefile | |
parent | f6f2aa39ef97cae03c71ecfecc334f0df60d7920 (diff) | |
parent | 4372da3441561b3852c0bf466304f1e4f3c06b3f (diff) | |
download | git-d025d1e322c715ecf7fa7c10ce9e6b4a1be982d0.zip git-d025d1e322c715ecf7fa7c10ce9e6b4a1be982d0.tar.gz git-d025d1e322c715ecf7fa7c10ce9e6b4a1be982d0.tar.bz2 |
Merge branch 'er/ui'
* er/ui:
Always bind the return key to the default button
Do not break git-gui messages into multiple lines.
Improve look-and-feel of the git-gui tool.
Teach git-gui to use the user-defined UI font everywhere.
Allow wish interpreter to be defined with TCLTK_PATH
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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 = @@ -55,6 +57,7 @@ all:: $(ALL_PROGRAMS) install: all $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)' + sed -i .bak -e'1,3s|^exec .* "$$0"|exec '"$(TCLTK_PATH)"' "$$0"|' git-gui && rm git-gui.bak $(INSTALL) git-gui '$(DESTDIR_SQ)$(gitexecdir_SQ)' $(foreach p,$(GITGUI_BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;) |