mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* git://ozlabs.org/~paulus/gitk:
  gitk: Ignore gitk-wish buildproduct
This commit is contained in:
Junio C Hamano
2013-01-30 13:52:44 -08:00
parent 070c57df42 a8b38d9571
commit 9a6c84e6e9
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gitk-git/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
/GIT-TCLTK-VARS
/gitk-wish

16
gitk-git/Makefile
View File

@ -17,6 +17,16 @@ DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
bindir_SQ = $(subst ','\'',$(bindir)) bindir_SQ = $(subst ','\'',$(bindir))
TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH)) 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 ## po-file creation rules
XGETTEXT ?= xgettext XGETTEXT ?= xgettext
ifdef NO_MSGFMT ifdef NO_MSGFMT
@ -49,9 +59,9 @@ uninstall::
$(RM) '$(DESTDIR_SQ)$(bindir_SQ)'/gitk $(RM) '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
clean:: 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) $@ $@+ && \ $(QUIET_GEN)$(RM) $@ $@+ && \
sed -e '1,3s|^exec .* "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' <gitk >$@+ && \ sed -e '1,3s|^exec .* "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' <gitk >$@+ && \
chmod +x $@+ && \ chmod +x $@+ && \
@ -65,3 +75,5 @@ $(ALL_MSGFILES): %.msg : %.po
@echo Generating catalog $@ @echo Generating catalog $@
$(MSGFMT) --statistics --tcl $< -l $(basename $(notdir $<)) -d $(dir $@) $(MSGFMT) --statistics --tcl $< -l $(basename $(notdir $<)) -d $(dir $@)
.PHONY: all install uninstall clean update-po
.PHONY: FORCE