[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

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



On 09/20/2013 08:13 AM, 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 redhat com>
> ---
>  docs/Makefile.am | 1 +
>  docs/newapi.xsl  | 8 +++++---
>  2 files changed, 6 insertions(+), 3 deletions(-)

ACK, once you resolve the default setting of builddir when not run by
make, and once you fix a nit:

> 
> 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) \

I don't know if we are fully clean in the rest of our makefile, but in
general, automake tries to allow $(abs_top_builddir) that contains
spaces (it guarantees that there are NOT spaces in any name relative to
$(builddir), where the idea is that some people build under '/home/full
name/dir/').   Therefore, you should write this as '$(abs_top_builddir)'.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

Attachment: signature.asc
Description: OpenPGP digital signature


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]