diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-05-07 23:36:31 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-05-07 23:51:00 -0400 |
| commit | 5f5dbd719d0d8ec136f32a0a56674902bd85f72f (patch) | |
| tree | f5898a282daf34722256709c7ac2ac7f78f9bbb7 /Makefile | |
| parent | 3082acfa7c626a34aa419a163585051c2df2bf09 (diff) | |
| parent | ebcaadabcb90eaf35a3bd69a50cccce4be4dcc2c (diff) | |
| download | git-5f5dbd719d0d8ec136f32a0a56674902bd85f72f.tar.gz git-5f5dbd719d0d8ec136f32a0a56674902bd85f72f.tar.xz | |
Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui:
git-gui: Use vi-like keys in merge dialog
git-gui: Include commit id/subject in merge choices
git-gui: Show all possible branches for merge
git-gui: Move merge support into a namespace
git-gui: Allow vi keys to scroll the diff/blame regions
git-gui: Move console procs into their own namespace
git-gui: Refactor into multiple files to save my sanity
git-gui: Track our own embedded values and rebuild when they change
git-gui: Refactor to use our git proc more often
git-gui: Use option database defaults to set the font
git-gui: Cleanup common font handling for font_ui
git-gui: Correct line wrapping for too many branch message
git-gui: Warn users before making an octopus merge
git-gui: Include the subject in the status bar after commit
Also perform an evil merge change to update Git's main Makefile to
pass the proper options down into git-gui now that it depends on
reasonable values for 'sharedir' and 'TCL_PATH'.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -114,7 +114,11 @@ all:: # # Define NO_TCLTK if you do not want Tcl/Tk GUI. # -# The TCLTK_PATH variable governs the location of the Tck/Tk interpreter. +# The TCL_PATH variable governs the location of the Tcl interpreter +# used to optimize git-gui for your system. Only used if NO_TCLTK +# is not set. Defaults to the bare 'tclsh'. +# +# The TCLTK_PATH variable governs the location of the Tcl/Tk interpreter. # If not set it defaults to the bare 'wish'. If it is set to the empty # string then NO_TCLTK will be forced (this is used by configure script). # @@ -140,7 +144,8 @@ STRIP ?= strip prefix = $(HOME) bindir = $(prefix)/bin gitexecdir = $(bindir) -template_dir = $(prefix)/share/git-core/templates/ +sharedir = $(prefix)/share/ +template_dir = $(sharedir)/git-core/templates/ ifeq ($(prefix),/usr) sysconfdir = /etc else @@ -165,15 +170,18 @@ GITWEB_FAVICON = git-favicon.png GITWEB_SITE_HEADER = GITWEB_SITE_FOOTER = -export prefix bindir gitexecdir template_dir sysconfdir +export prefix bindir gitexecdir sharedir template_dir sysconfdir CC = gcc AR = ar TAR = tar INSTALL = install RPMBUILD = rpmbuild +TCL_PATH = tclsh TCLTK_PATH = wish +export TCL_PATH TCLTK_PATH + # sparse is architecture-neutral, which means that we need to tell it # explicitly what architecture to check for. Fix this up for yours.. SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__ @@ -713,7 +721,7 @@ endif all:: ifndef NO_TCLTK - $(QUIET_SUBDIR0)git-gui $(QUIET_SUBDIR1) TCLTK_PATH='$(TCLTK_PATH_SQ)' all + $(QUIET_SUBDIR0)git-gui $(QUIET_SUBDIR1) all endif $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all $(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1) |