From: Junio C Hamano <junkio@cox.net>
Date: Wed, 21 Sep 2005 19:31:33 +0000 (-0700)
Subject: Merge branch 'fixes'
X-Git-Tag: v0.99.8~93
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0493a3fd5204a36bc961a8611770ddb9ec1ed8ed?ds=inline;hp=-c

Merge branch 'fixes'
---

0493a3fd5204a36bc961a8611770ddb9ec1ed8ed
diff --combined Documentation/Makefile
index 822098ad9c,01fad8ea5d..aecae676de
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -44,26 -44,28 +44,28 @@@ man: man1 man
  man1: $(DOC_MAN1)
  man7: $(DOC_MAN7)
  
- install:
+ 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