From c6ee08feaaa06a56ae311c1ee004a11f80f184e8 Mon Sep 17 00:00:00 2001
From: Thomas Schraitle <toms@suse.de>
Date: Thu, 23 May 2019 16:12:24 +0200
Subject: [PATCH] Fix #510: Make XPointer work

Jing fails as it depends on Xerces. As Xerces does not support
the xpointer() scheme, we need to give jing a "complete"
document. The document is created by `xmllint`.

Currently it's an ugly implementation as it appends ".resolved"
to the `PROFILED_MAIN` variable. Probably we need to adapt the
code in other locations too.

For the time being, it's just the validate subcommand.
---
 make/validate.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/make/validate.mk b/make/validate.mk
index 471416b48..71d2a4932 100644
--- a/make/validate.mk
+++ b/make/validate.mk
@@ -37,7 +37,10 @@ $(PROFILEDIR)/.validate validate: $(PROFILES)
   ifeq "$(DOCBOOK_VERSION)" "4"
 	xmllint --noent --postvalid --noout --xinclude $(PROFILED_MAIN)
   else
-	$(JING_WRAPPER) $(JING_FLAGS) $(DOCBOOK5_RNG) $(PROFILED_MAIN)
+	@ccecho "info" "Resolving XIncludes and XPointers..."
+	xmllint --output $(PROFILED_MAIN).resolved  --noent --xinclude $(PROFILED_MAIN)
+	@ccecho "info" "Validating with Jing..."
+	$(JING_WRAPPER) $(JING_FLAGS) $(DOCBOOK5_RNG) $(PROFILED_MAIN).resolved
   endif
 	touch $(PROFILEDIR)/.validate
   ifeq "$(TARGET)" "validate"