summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-04-17 17:15:56 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-04-17 17:15:56 (GMT)
commit69dd97a430d3deebbcade1d38c53110342440890 (patch)
tree43e4eddce5b7c68576d82ad9abcd05a0a3ee0d20
parent19c821487b28f56180290aa7d1f30e6bd5316225 (diff)
downloadgit-69dd97a430d3deebbcade1d38c53110342440890.zip
git-69dd97a430d3deebbcade1d38c53110342440890.tar.gz
git-69dd97a430d3deebbcade1d38c53110342440890.tar.bz2
Revert "Allow wish interpreter to be defined with TCLTK_PATH"
This reverts commit e2a1bc67d321a0c03737179f331c39a52e7049d7. Junio rightly pointed out this patch doesn't handle the `make install` target very well: Junio C Hamano <junkio@cox.net> writes: > You should never generate new files in the source tree from > 'install' target. Otherwise, the usual pattern of "make" as > yourself and then "make install" as root would not work from a > "root-to-nobody-squashing" NFS mounted source tree to local > filesystem. You should know better than accepting such a patch.
-rw-r--r--Makefile3
1 files changed, 0 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 2316b24..b82789e 100644
--- a/Makefile
+++ b/Makefile
@@ -28,8 +28,6 @@ ifndef V
QUIET_BUILT_IN = @echo ' ' BUILTIN $@;
endif
-TCLTK_PATH ?= wish
-
ifeq ($(findstring $(MAKEFLAGS),s),s)
QUIET_GEN =
QUIET_BUILT_IN =
@@ -57,7 +55,6 @@ 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' ;)