From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 27 Mar 2009 07:36:47 +0000 (-0700)
Subject: Merge branch 'cj/doc-quiet' into cj/doc-format
X-Git-Tag: v1.6.3-rc0~51^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=32786093108231ef7d9e403e90b239f67428c3dd;p=git.git

Merge branch 'cj/doc-quiet' into cj/doc-format

* cj/doc-quiet:
  Documentation/Makefile: break up texi pipeline
  Documentation/Makefile: make most operations "quiet"

Conflicts:
	Documentation/Makefile
---

32786093108231ef7d9e403e90b239f67428c3dd
diff --cc Documentation/Makefile
index 1c9453187,d14537239..dae317466
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -195,13 -190,13 +221,13 @@@ $(MAN_HTML): %.html : %.tx
  	mv $@+ $@
  
  %.1 %.5 %.7 : %.xml
- 	$(RM) $@
+ 	$(QUIET_XMLTO)$(RM) $@ && \
 -	xmlto -m $(MANPAGE_XSL) man $<
 +	xmlto -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
  
  %.xml : %.txt
- 	$(RM) $@+ $@
+ 	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
  	$(ASCIIDOC) -b docbook -d manpage -f asciidoc.conf \
- 		$(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $<
+ 		$(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \
  	mv $@+ $@
  
  user-manual.xml: user-manual.txt user-manual.conf