Re: [libvirt] [PATCH] docs: Load libvirt_access*.xml from build dir

On Fri, Sep 20, 2013 at 16:13:54 +0200, Jiri Denemark wrote: > 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(a)redhat.com&gt; > --- > docs/Makefile.am | 1 + > docs/newapi.xsl | 8 +++++--- > 2 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/docs/Makefile.am b/docs/Makefile.am > index c6a3ead..faf2a32 100644 > --- a/docs/Makefile.am > +++ b/docs/Makefile.am > @@ -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" \ > diff --git a/docs/newapi.xsl b/docs/newapi.xsl > index 606d244..b1728ee 100644 > --- a/docs/newapi.xsl > +++ b/docs/newapi.xsl > @@ -25,18 +25,20 @@ > <!-- Build keys for all symbols --> > <xsl:key name="symbols" match="/api/symbols/*" use="@name"/> > > + <xsl:param name="builddir" select=".."/> Oh, actually, the above should have been select="'..'" as this is a string parameter. It should only matter when someone calls xsltproc by hand as the Makefile always overrides the default value.