Documentation: bisect: add some titles to some paragraphs.

diff --git a/git-gui/Makefile b/git-gui/Makefile
index 8fade69127611ba9a6e38bed65b861379ac7dcce..b82789ead6255b33be0f1ed2029a91611cea3072 100644 (file)
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -1,5 +1,8 @@
 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
@@ -12,26 +15,40 @@ ifndef SHELL_PATH
        SHELL_PATH = /bin/sh
 endif
 
-gitexecdir := $(shell git --exec-path)
-INSTALL = install
+ifndef gitexecdir
+       gitexecdir := $(shell git --exec-path)
+endif
+
+ifndef INSTALL
+       INSTALL = install
+endif
+
+ifndef V
+       QUIET_GEN      = @echo '   ' GEN $@;
+       QUIET_BUILT_IN = @echo '   ' BUILTIN $@;
+endif
+
+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))
 
 $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
-       rm -f $@ $@+
+       $(QUIET_GEN)rm -f $@ $@+ && \
        sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-               -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
-               $@.sh >$@+
-       chmod +x $@+
+               -e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \
+               $@.sh >$@+ && \
+       chmod +x $@+ && \
        mv $@+ $@
 
 $(GITGUI_BUILT_INS): git-gui
-       rm -f $@ && ln git-gui $@
+       $(QUIET_BUILT_IN)rm -f $@ && ln git-gui $@
 
-# These can record GIT_VERSION
+# These can record GITGUI_VERSION
 $(patsubst %.sh,%,$(SCRIPT_SH)): GIT-VERSION-FILE
 
 all:: $(ALL_PROGRAMS)
@@ -41,8 +58,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:
+       @mkdir -p $(TARDIR)
+       @echo $(GITGUI_VERSION) > $(TARDIR)/version
+
 clean::
        rm -f $(ALL_PROGRAMS) GIT-VERSION-FILE
 
-.PHONY: all install clean
+.PHONY: all install dist-version clean
 .PHONY: .FORCE-GIT-VERSION-FILE