Re: [libvirt] [PATCH] docs: Load libvirt_access*.xml from build dir
On 09/20/2013 08:16 AM, Jiri Denemark wrote:
> +++ 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) \
The makefile populates it without ''...
>
> + <xsl:param name="builddir" select=".."/>
as does your default...
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.
> <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"/>
and you are expanding {$builddir} _within_ a '' context. I'm assuming
that as written, it expands to ('../src/...'), but if builddir is
defined with "'..'", it would expand to
(''..'/src/...'). So what am I
missing (probably a misunderstanding on my part about how xslt variable
expansion works)?
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
Attachments:
- signature.asc (application/pgp-signature — 621 bytes)