New: variable ASCIIDOC_FLAGS was introduced. It was also added to two new targets. The old ASCIIDOC_EXTRA is set to --unsafe under Cygwin to ignore asciidoc error about unsafe include. Signed-off-by: Jari Aalto <jari.aalto@xxxxxxxxx> --- Documentation/Makefile | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 3f92783..399ff12 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -37,6 +37,14 @@ man7dir=$(mandir)/man7 ASCIIDOC=asciidoc ASCIIDOC_EXTRA = + +ifneq (,$(CYGWIN)) +# Ignore 'include' call errors +ASCIIDOC_EXTRA = --unsafe +endif + +ASCIIDOC_FLAGS += $(ASCIIDOC_EXTRA) + INSTALL?=install DOC_REF = origin/man @@ -112,7 +120,7 @@ clean: %.html : %.txt rm -f $@+ $@ $(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf \ - $(ASCIIDOC_EXTRA) -o - $< | \ + $(ASCIIDOC_FLAGS) -o - $< | \ sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' >$@+ mv $@+ $@ @@ -122,12 +130,12 @@ clean: %.xml : %.txt rm -f $@+ $@ $(ASCIIDOC) -b docbook -d manpage -f asciidoc.conf \ - $(ASCIIDOC_EXTRA) -o - $< | \ + $(ASCIIDOC_FLAGS) -o - $< | \ sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' >$@+ mv $@+ $@ user-manual.xml: user-manual.txt user-manual.conf - $(ASCIIDOC) -b docbook -d book $< + $(ASCIIDOC) -b docbook -d book $(ASCIIDOC_FLAGS) $< XSLT = http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl XSLTOPTS = --xinclude --stringparam html.stylesheet docbook-xsl.css @@ -141,13 +149,13 @@ howto-index.txt: howto-index.sh $(wildcard howto/*.txt) mv $@+ $@ $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt - $(ASCIIDOC) -b xhtml11 $*.txt + $(ASCIIDOC) -b xhtml11 $(ASCIIDOC_FLAGS) $*.txt WEBDOC_DEST = /pub/software/scm/git/docs $(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt rm -f $@+ $@ - sed -e '1,/^$$/d' $< | $(ASCIIDOC) -b xhtml11 - >$@+ + sed -e '1,/^$$/d' $< | $(ASCIIDOC) -b xhtml11 $(ASCIIDOC_FLAGS) - >$@+ mv $@+ $@ install-webdoc : html -- 1.5.1.3 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html