summaryrefslogtreecommitdiff
path: root/Documentation/Makefile
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2007-06-01 09:10:30 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-06-02 18:28:13 (GMT)
commit4159c5781303bb24d82be69b6a5de92d51d8d4f0 (patch)
treed707e3ef7a8683b5f00bfc8a1d8b00b366992c54 /Documentation/Makefile
parent8e29f903eb366b2d2e846dc35ec4510d2cb263ad (diff)
downloadgit-4159c5781303bb24d82be69b6a5de92d51d8d4f0.zip
git-4159c5781303bb24d82be69b6a5de92d51d8d4f0.tar.gz
git-4159c5781303bb24d82be69b6a5de92d51d8d4f0.tar.bz2
Documentation: robustify asciidoc GIT_VERSION replacement
Instead of using sed on the resulting file, we now have a git_version asciidoc attribute. This means that we don't pipe the output of asciidoc, which means we can detect build failures. Problem reported by Scott Lamb, solution suggested by Jonas Fonseca. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/Makefile')
-rw-r--r--Documentation/Makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 3f92783..4064b38 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -112,8 +112,7 @@ clean:
%.html : %.txt
rm -f $@+ $@
$(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf \
- $(ASCIIDOC_EXTRA) -o - $< | \
- sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' >$@+
+ $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $<
mv $@+ $@
%.1 %.5 %.7 : %.xml
@@ -122,8 +121,7 @@ clean:
%.xml : %.txt
rm -f $@+ $@
$(ASCIIDOC) -b docbook -d manpage -f asciidoc.conf \
- $(ASCIIDOC_EXTRA) -o - $< | \
- sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' >$@+
+ $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $<
mv $@+ $@
user-manual.xml: user-manual.txt user-manual.conf