Skip to content

Commit a8b38d9

Browse files
chriscoolpaulusmack
authored andcommitted
gitk: Ignore gitk-wish buildproduct
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]> Signed-off-by: Paul Mackerras <[email protected]>
1 parent 386befb commit a8b38d9

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/GIT-TCLTK-VARS
2+
/gitk-wish

Makefile

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@ DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
1717
bindir_SQ = $(subst ','\'',$(bindir))
1818
TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
1919

20+
### Detect Tck/Tk interpreter path changes
21+
TRACK_TCLTK = $(subst ','\'',-DTCLTK_PATH='$(TCLTK_PATH_SQ)')
22+
23+
GIT-TCLTK-VARS: FORCE
24+
@VARS='$(TRACK_TCLTK)'; \
25+
if test x"$$VARS" != x"`cat $@ 2>/dev/null`" ; then \
26+
echo 1>&2 " * new Tcl/Tk interpreter location"; \
27+
echo "$$VARS" >$@; \
28+
fi
29+
2030
## po-file creation rules
2131
XGETTEXT ?= xgettext
2232
ifdef NO_MSGFMT
@@ -49,9 +59,9 @@ uninstall::
4959
$(RM) '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
5060

5161
clean::
52-
$(RM) gitk-wish po/*.msg
62+
$(RM) gitk-wish po/*.msg GIT-TCLTK-VARS
5363

54-
gitk-wish: gitk
64+
gitk-wish: gitk GIT-TCLTK-VARS
5565
$(QUIET_GEN)$(RM) $@ $@+ && \
5666
sed -e '1,3s|^exec .* "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' <gitk >$@+ && \
5767
chmod +x $@+ && \
@@ -65,3 +75,5 @@ $(ALL_MSGFILES): %.msg : %.po
6575
@echo Generating catalog $@
6676
$(MSGFMT) --statistics --tcl $< -l $(basename $(notdir $<)) -d $(dir $@)
6777

78+
.PHONY: all install uninstall clean update-po
79+
.PHONY: FORCE

0 commit comments

Comments
 (0)