Merge branch 'maint'

diff --git a/git-gui/Makefile b/git-gui/Makefile
index 66538ba1adb9d50b80288f9ae3c0df77758059aa..b29d7d1e68d2489fd07612c8d0062d3491f04719 100644 (file)
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -1,11 +1,15 @@
 all::
 
+# Define V=1 to have a more verbose compile.
+#
+
 GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
        @$(SHELL_PATH) ./GIT-VERSION-GEN
 -include GIT-VERSION-FILE
 
+SCRIPT_SH = git-gui.sh
 GITGUI_BUILT_INS = git-citool
-ALL_PROGRAMS = git-gui $(GITGUI_BUILT_INS)
+ALL_PROGRAMS = $(GITGUI_BUILT_INS) $(patsubst %.sh,%,$(SCRIPT_SH))
 
 ifndef SHELL_PATH
        SHELL_PATH = /bin/sh
@@ -19,27 +23,37 @@ ifndef INSTALL
        INSTALL = install
 endif
 
+ifndef V
+       QUIET_GEN      = @echo '   ' GEN $@;
+       QUIET_BUILT_IN = @echo '   ' BUILTIN $@;
+endif
+
+TCLTK_PATH ?= wish
+
+ifeq ($(findstring $(MAKEFLAGS),s),s)
+QUIET_GEN =
+QUIET_BUILT_IN =
+endif
+
 DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
 gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
 SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
+TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
 
-git-gui: git-gui.sh GIT-VERSION-FILE CREDITS-FILE
-       rm -f $@ $@+
-       sed -n \
-               -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
+$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
+       $(QUIET_GEN)rm -f $@ $@+ && \
+       sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
+               -e 's|^exec wish "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' \
                -e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \
-               -e '1,/^set gitgui_credits /p' \
-               $@.sh >$@+
-       cat CREDITS-FILE >>$@+
-       sed -e '1,/^set gitgui_credits /d' $@.sh >>$@+
-       chmod +x $@+
+               $@.sh >$@+ && \
+       chmod +x $@+ && \
        mv $@+ $@
 
-CREDITS-FILE: CREDITS-GEN .FORCE-CREDITS-FILE
-       $(SHELL_PATH) ./CREDITS-GEN
-
 $(GITGUI_BUILT_INS): git-gui
-       rm -f $@ && ln git-gui $@
+       $(QUIET_BUILT_IN)rm -f $@ && ln git-gui $@
+
+# These can record GITGUI_VERSION
+$(patsubst %.sh,%,$(SCRIPT_SH)): GIT-VERSION-FILE
 
 all:: $(ALL_PROGRAMS)
 
@@ -48,14 +62,12 @@ install: all
        $(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' ;)
 
-dist-version: CREDITS-FILE
+dist-version:
        @mkdir -p $(TARDIR)
        @echo $(GITGUI_VERSION) > $(TARDIR)/version
-       @cat CREDITS-FILE > $(TARDIR)/credits
 
 clean::
-       rm -f $(ALL_PROGRAMS) GIT-VERSION-FILE CREDITS-FILE
+       rm -f $(ALL_PROGRAMS) GIT-VERSION-FILE
 
 .PHONY: all install dist-version clean
 .PHONY: .FORCE-GIT-VERSION-FILE
-.PHONY: .FORCE-CREDITS-FILE