From 51ad64cc0791f797c936d8d7b1cef0dec64c0ce3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri, 18 Sep 2009 11:45:56 +0000
Subject: * Use xmllint (>= 2.7.4) for RelaxNG validation instead of Jing.

---
 doc/manual/Makefile.am | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'doc')

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:
-- 
cgit 1.4.1