Avoid misleading success message on error

[git.git] / Documentation / Makefile

diff --git a/Documentation/Makefile b/Documentation/Makefile
index bb21d6a..a1ff2c2 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -9,6 +9,7 @@ ARTICLES += diffcore
 ARTICLES += howto-index
 ARTICLES += repository-layout
 ARTICLES += hooks
+ARTICLES += everyday
 # with their own formatting rules.
 SP_ARTICLES = glossary howto/revert-branch-rebase
 
@@ -17,14 +18,14 @@ DOC_HTML += $(patsubst %,%.html,$(ARTICLES) $(SP_ARTICLES))
 DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TXT))
 DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
 
-prefix=$(HOME)
+prefix?=$(HOME)
 bin=$(prefix)/bin
 mandir=$(prefix)/man
 man1=$(mandir)/man1
 man7=$(mandir)/man7
 # DESTDIR=
 
-INSTALL=install
+INSTALL?=install
 
 #
 # Please note that there is a minor bug in asciidoc.
@@ -49,17 +50,22 @@ install: man
        $(INSTALL) $(DOC_MAN1) $(DESTDIR)/$(man1)
        $(INSTALL) $(DOC_MAN7) $(DESTDIR)/$(man7)
 
-# 'include' dependencies
-$(patsubst %.txt,%.1,$(wildcard git-diff-*.txt)): \
-       diff-format.txt diff-options.txt
-$(patsubst %,%.1,git-fetch git-pull git-push): pull-fetch-param.txt
-$(patsubst %.txt,%.html,$(wildcard git-diff-*.txt)): \
-       diff-format.txt diff-options.txt
-$(patsubst %,%.html,git-fetch git-pull git-push): pull-fetch-param.txt
+
+#
+# Determine "include::" file references in asciidoc files.
+#
+doc.dep : $(wildcard *.txt) build-docdep.perl
+       rm -f $@+ $@
+       perl ./build-docdep.perl >$@+
+       mv $@+ $@
+
+-include doc.dep
+
 git.7: ../README
 
+
 clean:
-       rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html
+       rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html doc.dep
 
 %.html : %.txt
        asciidoc -b xhtml11 -d manpage -f asciidoc.conf $<