]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
docs: Load libvirt_access*.xml from build dir
authorJiri Denemark <jdenemar@redhat.com>
Fri, 20 Sep 2013 09:47:39 +0000 (11:47 +0200)
committerJiri Denemark <jdenemar@redhat.com>
Mon, 23 Sep 2013 12:16:45 +0000 (14:16 +0200)
The xml files are generated in build directory and thus docs/newapi.xsl
was not able to find them in a VPATH build.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
docs/Makefile.am
docs/newapi.xsl

index c6a3eadc958b626fe8b5af47fd538f64801fd05c..9de3406d878e9c85a356f6401a03be0b643eb0f3 100644 (file)
@@ -242,6 +242,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in
 html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in
        $(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \
          $(XSLTPROC) --nonet -o $(srcdir)/ \
+         --stringparam builddir '$(abs_top_builddir)' \
          $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml ; fi && \
        if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \
          if $(XMLCATALOG) '$(XML_CATALOG_FILE)' "-//W3C//DTD XHTML 1.0 Strict//EN" \
index 606d24436b297e215448863748f2e6b39a36eea9..7fa0f26889434ea28cff66a0e07347b7111005e0 100644 (file)
   <!-- Build keys for all symbols -->
   <xsl:key name="symbols" match="/api/symbols/*" use="@name"/>
 
+  <xsl:param name="builddir" select="'..'"/>
+
   <!-- the target directory for the HTML output -->
   <xsl:variable name="htmldir">html</xsl:variable>
   <xsl:variable name="href_base">../</xsl:variable>
 
   <xsl:variable name="acls">
-    <xsl:copy-of select="document('../src/libvirt_access.xml')/aclinfo/api"/>
+    <xsl:copy-of select="document('{$builddir}/src/libvirt_access.xml')/aclinfo/api"/>
   </xsl:variable>
   <xsl:variable name="qemuacls">
-    <xsl:copy-of select="document('../src/libvirt_access_qemu.xml')/aclinfo/api"/>
+    <xsl:copy-of select="document('{$builddir}/src/libvirt_access_qemu.xml')/aclinfo/api"/>
   </xsl:variable>
   <xsl:variable name="lxcacls">
-    <xsl:copy-of select="document('../src/libvirt_access_lxc.xml')/aclinfo/api"/>
+    <xsl:copy-of select="document('{$builddir}/src/libvirt_access_lxc.xml')/aclinfo/api"/>
   </xsl:variable>
 
   <xsl:template name="aclinfo">