From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: [PATCH] Makefile: track TCLTK_PATH as it used to be tracked Date: Wed, 09 Jan 2013 08:55:31 -0800 Message-ID: <7vobgy70u4.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org, Christian Couder To: paulus@samba.org X-From: git-owner@vger.kernel.org Wed Jan 09 17:56:03 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Tsywb-0002rJ-DT for gcvg-git-2@plane.gmane.org; Wed, 09 Jan 2013 17:56:01 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932293Ab3AIQzf (ORCPT ); Wed, 9 Jan 2013 11:55:35 -0500 Received: from b-pb-sasl-quonix.pobox.com ([208.72.237.35]:50008 "EHLO smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932285Ab3AIQze (ORCPT ); Wed, 9 Jan 2013 11:55:34 -0500 Received: from smtp.pobox.com (unknown [127.0.0.1]) by b-sasl-quonix.pobox.com (Postfix) with ESMTP id 913D0A759; Wed, 9 Jan 2013 11:55:33 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:date:message-id:mime-version:content-type; s=sasl; bh=X 2t9tsBCzUX5EJD0hbjQq9FclMQ=; b=pbTGUJCGznlhukjkyuZsIFgs8OsTrbPN7 EttsZ1BThpZVYzb6SycF6rV/EjTTa59vRTsu+34Yvfld3B3D/oSEAVUH9PovE/co CLiCSGB4uoxEW0Td40gc3jJA/0IX6UoXeuiHz+/aCcqEJ29MXBXehDRXRkfTO4i0 48ae0CxPto= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:date:message-id:mime-version:content-type; q=dns; s= sasl; b=r56f7byFTVqgfS7htJgTFHZREQ8BMGS5fMdYQ2tLuH1KVlIvPoJ/YlyN VosKUZFhwkpX0rDUYdOWJ90DI7Db742XpzSpGf0+CYWEdoYtMo4Z55hofIlz3sa0 +zbBN9QAj9ec5EtXu3jnEOY+oDTWDok9VpX74h1ci/P2SAVSxok= Received: from b-pb-sasl-quonix.pobox.com (unknown [127.0.0.1]) by b-sasl-quonix.pobox.com (Postfix) with ESMTP id 846DBA758; Wed, 9 Jan 2013 11:55:33 -0500 (EST) Received: from pobox.com (unknown [98.234.214.94]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by b-sasl-quonix.pobox.com (Postfix) with ESMTPSA id DEB0DA756; Wed, 9 Jan 2013 11:55:32 -0500 (EST) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-Pobox-Relay-ID: 619684E0-5A7D-11E2-80F5-F0CE2E706CDE-77302942!b-pb-sasl-quonix.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: From: Christian Couder gitk, when bound into the git.git project tree, used to live at the root level, but in 62ba514 (Move gitk to its own subdirectory, 2007-11-17) it was moved to a subdirectory. The code used to track changes to TCLTK_PATH (which should cause gitk to be rebuilt to point at the new interpreter) was left in the main Makefile instead of being moved to the new Makefile that was created for the gitk project. Also add .gitignore file to list build artifacts for the gitk project. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- Paul, this is relative to the tip of your tree, 386befb (gitk: Display important heads even when there are many, 2013-01-02). Could you consider applying it? Also I notice that you have many patches I still do not have there, and I'd appreciate a "Go ahead and pull from me!". Thanks. .gitignore | 2 ++ Makefile | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d7ebcaf --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/GIT-TCLTK-VARS +/gitk-wish diff --git a/Makefile b/Makefile index e1b6045..5acdc90 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,16 @@ 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 @@ -49,9 +59,9 @@ uninstall:: $(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"|' $@+ && \ chmod +x $@+ && \ @@ -65,3 +75,5 @@ $(ALL_MSGFILES): %.msg : %.po @echo Generating catalog $@ $(MSGFMT) --statistics --tcl $< -l $(basename $(notdir $<)) -d $(dir $@) +.PHONY: all install uninstall clean update-po +.PHONY: FORCE -- 1.8.1.336.g866ceff