From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 Jan 2013 21:52:44 +0000 (-0800)
Subject: Merge git://ozlabs.org/~paulus/gitk
X-Git-Tag: v1.8.2-rc0~73
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9a6c84e6e9078b0ef4fd2c50b200e8552a28c6fa;p=git-core%2Fgit.git

Merge git://ozlabs.org/~paulus/gitk

* git://ozlabs.org/~paulus/gitk:
  gitk: Ignore gitk-wish buildproduct
---

9a6c84e6e9078b0ef4fd2c50b200e8552a28c6fa
diff --cc gitk-git/.gitignore
index 000000000,000000000..d7ebcaf36
new file mode 100644
--- /dev/null
+++ b/gitk-git/.gitignore
@@@ -1,0 -1,0 +1,2 @@@
++/GIT-TCLTK-VARS
++/gitk-wish
diff --cc gitk-git/Makefile
index e1b604560,000000000..5acdc900a
mode 100644,000000..100644
--- a/gitk-git/Makefile
+++ b/gitk-git/Makefile
@@@ -1,67 -1,0 +1,79 @@@
 +# The default target of this Makefile is...
 +all::
 +
 +prefix ?= $(HOME)
 +bindir ?= $(prefix)/bin
 +sharedir ?= $(prefix)/share
 +gitk_libdir   ?= $(sharedir)/gitk/lib
 +msgsdir    ?= $(gitk_libdir)/msgs
 +msgsdir_SQ  = $(subst ','\'',$(msgsdir))
 +
 +TCL_PATH ?= tclsh
 +TCLTK_PATH ?= wish
 +INSTALL ?= install
 +RM ?= rm -f
 +
 +DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
 +bindir_SQ = $(subst ','\'',$(bindir))
 +TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
 +
++### Detect Tck/Tk interpreter path changes
++TRACK_TCLTK = $(subst ','\'',-DTCLTK_PATH='$(TCLTK_PATH_SQ)')
++
++GIT-TCLTK-VARS: FORCE
++	@VARS='$(TRACK_TCLTK)'; \
++		if test x"$$VARS" != x"`cat $@ 2>/dev/null`" ; then \
++			echo 1>&2 "    * new Tcl/Tk interpreter location"; \
++			echo "$$VARS" >$@; \
++		fi
++
 +## po-file creation rules
 +XGETTEXT   ?= xgettext
 +ifdef NO_MSGFMT
 +	MSGFMT ?= $(TCL_PATH) po/po2msg.sh
 +else
 +	MSGFMT ?= msgfmt
 +	ifneq ($(shell $(MSGFMT) --tcl -l C -d . /dev/null 2>/dev/null; echo $$?),0)
 +		MSGFMT := $(TCL_PATH) po/po2msg.sh
 +	endif
 +endif
 +
 +PO_TEMPLATE = po/gitk.pot
 +ALL_POFILES = $(wildcard po/*.po)
 +ALL_MSGFILES = $(subst .po,.msg,$(ALL_POFILES))
 +
 +ifndef V
 +	QUIET          = @
 +	QUIET_GEN      = $(QUIET)echo '   ' GEN $@ &&
 +endif
 +
 +all:: gitk-wish $(ALL_MSGFILES)
 +
 +install:: all
 +	$(INSTALL) -m 755 gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
 +	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(msgsdir_SQ)'
 +	$(foreach p,$(ALL_MSGFILES), $(INSTALL) -m 644 $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
 +
 +uninstall::
 +	$(foreach p,$(ALL_MSGFILES), $(RM) '$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) &&) true
 +	$(RM) '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
 +
 +clean::
- 	$(RM) gitk-wish po/*.msg
++	$(RM) gitk-wish po/*.msg GIT-TCLTK-VARS
 +
- gitk-wish: gitk
++gitk-wish: gitk GIT-TCLTK-VARS
 +	$(QUIET_GEN)$(RM) $@ $@+ && \
 +	sed -e '1,3s|^exec .* "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' <gitk >$@+ && \
 +	chmod +x $@+ && \
 +	mv -f $@+ $@
 +
 +$(PO_TEMPLATE): gitk
 +	$(XGETTEXT) -kmc -LTcl -o $@ gitk
 +update-po:: $(PO_TEMPLATE)
 +	$(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; )
 +$(ALL_MSGFILES): %.msg : %.po
 +	@echo Generating catalog $@
 +	$(MSGFMT) --statistics --tcl $< -l $(basename $(notdir $<)) -d $(dir $@)
 +
++.PHONY: all install uninstall clean update-po
++.PHONY: FORCE