about summary refs log tree commit diff
path: root/doc/manual/Makefile.am
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2009-09-18T11·45+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2009-09-18T11·45+0000
commit51ad64cc0791f797c936d8d7b1cef0dec64c0ce3 (patch)
tree2b416ed275b0d910c9d1acc298f96d97ad9db3c9 /doc/manual/Makefile.am
parentdf05a759e4b73058ade82b6008c405cc5c75b104 (diff)
* Use xmllint (>= 2.7.4) for RelaxNG validation instead of Jing.
Diffstat (limited to 'doc/manual/Makefile.am')
-rw-r--r--doc/manual/Makefile.am8
1 files changed, 2 insertions, 6 deletions
diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am
index 8dbc196f7e74..55450c9a5990 100644
--- a/doc/manual/Makefile.am
+++ b/doc/manual/Makefile.am
@@ -34,13 +34,9 @@ MANUAL_SRCS = manual.xml introduction.xml installation.xml \
  conf-file.xml release-notes.xml \
  style.css images
 
+# Note: RelaxNG validation requires xmllint >= 2.7.4.
 manual.is-valid: $(MANUAL_SRCS) version.txt
-#	$(XMLLINT) --xinclude $< | $(XMLLINT) --noout --nonet --relaxng $(docbookrng)/docbook.rng -
-	if test "$(jing)" != "false"; then \
-		$(XMLLINT) --xinclude $< | $(jing) $(docbookrng)/docbook.rng /dev/fd/0; \
-	else \
-		echo "Not validating."; \
-	fi
+	$(XMLLINT) --noout --nonet --xinclude --noxincludenode --relaxng $(docbookrng)/docbook.rng $<
 	touch $@
 
 version.txt: