X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2FMakefile;h=aecae676dea995749ed9ba7122e31f5d0c64974c;hb=4fa2197e614950279527b14825d1e9572454a48c;hp=afdecc1a7fc512f9524a2977d8e924e7630c863c;hpb=a1d4aa742416953a3ac9be9154c55e90a4193cd6;p=git.git

diff --git a/Documentation/Makefile b/Documentation/Makefile
index afdecc1a..aecae676 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -8,6 +8,7 @@ ARTICLES += cvs-migration
 ARTICLES += diffcore
 ARTICLES += howto-index
 ARTICLES += repository-layout
+ARTICLES += hooks
 # with their own formatting rules.
 SP_ARTICLES = glossary howto/revert-branch-rebase
 
@@ -43,26 +44,28 @@ man: man1 man7
 man1: $(DOC_MAN1)
 man7: $(DOC_MAN7)
 
-install:
-	$(INSTALL) -m755 -d $(DESTDIR)/$(man1) $(DESTDIR)/$(man7)
+install: man
+	$(INSTALL) -d -m755 $(DESTDIR)/$(man1) $(DESTDIR)/$(man7)
 	$(INSTALL) $(DOC_MAN1) $(DESTDIR)/$(man1)
 	$(INSTALL) $(DOC_MAN7) $(DESTDIR)/$(man7)
 
 # 'include' dependencies
-git-diff-%.txt: diff-format.txt diff-options.txt
-	touch $@
+$(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
+git.7: ../README
 
 clean:
 	rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html
 
 %.html : %.txt
-	asciidoc -b xhtml11 -d manpage $<
+	asciidoc -b xhtml11 -d manpage -f asciidoc.conf $<
 
 %.1 %.7 : %.xml
 	xmlto man $<
 
 %.xml : %.txt
-	asciidoc -b docbook -d manpage $<
+	asciidoc -b docbook -d manpage -f asciidoc.conf $<
 
 git.html: git.txt ../README