From: Daniel P. Berrangé <berrange@redhat.com>
Date: Wed, 20 Nov 2019 15:24:18 +0000 (+0000)
Subject: docs: fix include of ACL permissions files
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=eef089db78700e829f0b2ddc83f38b9cef2379bf;p=libvirt.git

docs: fix include of ACL permissions files

The XSL generator loads included HTML files relative to the source dir
but we need to tell it to load them from the build dir instead.

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 5c76891ba4..2a104bc837 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -293,6 +293,7 @@ EXTRA_DIST += \
 	    style=subsite.xsl; \
 	  fi; \
 	  $(XSLTPROC) --stringparam pagename $$name \
+	    --stringparam builddir '$(abs_top_builddir)' \
 	    --stringparam timestamp $(timestamp) --nonet \
 	    $(top_srcdir)/docs/$$style $< > $@ \
 	    || { rm $@ && exit 1; }
diff --git a/docs/newapi.xsl b/docs/newapi.xsl
index dd6169397b..670879dc48 100644
--- a/docs/newapi.xsl
+++ b/docs/newapi.xsl
@@ -22,7 +22,6 @@
   <!-- Build keys for all symbols -->
   <xsl:key name="symbols" match="/api/symbols/*" use="@name"/>
 
-  <xsl:param name="builddir" select="'..'"/>
   <xsl:param name="indexfile" select="'index.html'"/>
 
   <!-- the target directory for the HTML output -->
diff --git a/docs/page.xsl b/docs/page.xsl
index 65ddeb2bb7..6f429ae087 100644
--- a/docs/page.xsl
+++ b/docs/page.xsl
@@ -7,6 +7,8 @@
   exclude-result-prefixes="xsl exsl html"
   version="1.0">
 
+  <xsl:param name="builddir" select="'..'"/>
+
   <xsl:template match="node() | @*" mode="content">
     <xsl:copy>
       <xsl:apply-templates select="node() | @*" mode="content"/>
@@ -168,7 +170,7 @@
 
   <xsl:template name="include">
     <xsl:variable name="inchtml">
-      <xsl:copy-of select="document(@filename)"/>
+      <xsl:copy-of select="document(concat($builddir, '/docs/', @filename))"/>
     </xsl:variable>
 
     <xsl:apply-templates select="exsl:node-set($inchtml)/html:html/html:body/*" mode="content"/>