diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2007-09-09 05:03:56 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-09-09 05:04:43 -0400 |
| commit | b2bd31006f02debe1ddf4fa8b73c52281516a871 (patch) | |
| tree | c4a6e62ea1901d2a92e385ed323a5be6b5988531 /Makefile | |
| parent | Merge branch 'maint' (diff) | |
| parent | git-gui: Avoid use of libdir in Makefile (diff) | |
| download | tgif-b2bd31006f02debe1ddf4fa8b73c52281516a871.tar.xz | |
Merge branch 'maint'
* maint:
git-gui: Avoid use of libdir in Makefile
git-gui: Disable Tk send in all git-gui sessions
git-gui: lib/index.tcl: handle files with % in the filename properly
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -78,8 +78,8 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) TCL_PATH_SQ = $(subst ','\'',$(TCL_PATH)) TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH)) -libdir ?= $(sharedir)/git-gui/lib -libdir_SQ = $(subst ','\'',$(libdir)) +gg_libdir ?= $(sharedir)/git-gui/lib +libdir_SQ = $(subst ','\'',$(gg_libdir)) exedir = $(dir $(gitexecdir))share/git-gui/lib exedir_SQ = $(subst ','\'',$(exedir)) @@ -107,7 +107,7 @@ $(GITGUI_BUILT_INS): git-gui XGETTEXT ?= xgettext MSGFMT ?= msgfmt -msgsdir ?= $(libdir)/msgs +msgsdir = $(gg_libdir)/msgs msgsdir_SQ = $(subst ','\'',$(msgsdir)) PO_TEMPLATE = po/git-gui.pot ALL_POFILES = $(wildcard po/*.po) @@ -143,7 +143,7 @@ TRACK_VARS = \ $(subst ','\'',TCL_PATH='$(TCL_PATH_SQ)') \ $(subst ','\'',TCLTK_PATH='$(TCLTK_PATH_SQ)') \ $(subst ','\'',gitexecdir='$(gitexecdir_SQ)') \ - $(subst ','\'',libdir='$(libdir_SQ)') \ + $(subst ','\'',gg_libdir='$(libdir_SQ)') \ #end TRACK_VARS GIT-GUI-VARS: .FORCE-GIT-GUI-VARS |