aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-04-21 23:54:04 -0700
committerJunio C Hamano <gitster@pobox.com>2010-04-21 23:54:04 -0700
commit3e7f1e6ccbfdc652539caba61b9be40c5dd89793 (patch)
tree3450376d8b04ba673210ba6adb53e5d6c0163b1b
parentddd02b70f0d80fc3cac6b2f2c42005560d572413 (diff)
parentf9dae0d3e63455206c1e1e169c76aca55aeb5d90 (diff)
downloadgit-3e7f1e6ccbfdc652539caba61b9be40c5dd89793.tar.gz
git-3e7f1e6ccbfdc652539caba61b9be40c5dd89793.tar.xz
Merge branch 'maint'
* maint: Documentation/Makefile: fix interrupted builds of user-manual.xml
-rw-r--r--Documentation/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 8a8a3954d..04f69cf64 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -264,7 +264,9 @@ manpage-base-url.xsl: manpage-base-url.xsl.in
mv $@+ $@
user-manual.xml: user-manual.txt user-manual.conf
- $(QUIET_ASCIIDOC)$(ASCIIDOC) $(ASCIIDOC_EXTRA) -b docbook -d book $<
+ $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
+ $(ASCIIDOC) $(ASCIIDOC_EXTRA) -b docbook -d book -o $@+ $< && \
+ mv $@+ $@
technical/api-index.txt: technical/api-index-skel.txt \
technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS))
@@ -278,7 +280,9 @@ XSLT = docbook.xsl
XSLTOPTS = --xinclude --stringparam html.stylesheet docbook-xsl.css
user-manual.html: user-manual.xml
- $(QUIET_XSLTPROC)xsltproc $(XSLTOPTS) -o $@ $(XSLT) $<
+ $(QUIET_XSLTPROC)$(RM) $@+ $@ && \
+ xsltproc $(XSLTOPTS) -o $@+ $(XSLT) $< && \
+ mv $@+ $@
git.info: user-manual.texi
$(QUIET_MAKEINFO)$(MAKEINFO) --no-split -o $@ user-manual.texi