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

Re: [libvirt] [PATCH 1/2] build: avoid non-srcdir installation failure (apibuild.py)



Eric Blake wrote:

> According to Jim Meyering on 2/24/2010 6:20 AM:
>> Running "make distcheck" from a non-srcdir build was failing like this:
>>
>>     /bin/sh: ./apibuild.py: No such file or directory
>>
>> Fixed that with the first patch below (the apibuild.py script
>> is not in ".", but in $(srcdir)).
>>
>> Then retrying, it got a little further but failed like this:
>>
>>     (../../docs/apibuild.py)
>>     make[3]: *** No rule to make target `sitemap.html.in', needed by `html/index.html'.  Stop.
>>
>> That was because sitemap.html.in was not being distributed.
>> Adding it to EXTRA_DIST solved that:
>
> ACK to both patches, but a question...

Thanks for the reviews.

>> @@ -131,7 +131,7 @@ devhelp/index.html devhelp/libvirt.devhelp: libvirt-api.xml $(devhelpxsl)
>>  libvirt-api.xml libvirt-refs.xml: apibuild.py \
>>  		$(srcdir)/../include/libvirt/*.h \
>>  		$(srcdir)/../src/libvirt.c $(srcdir)/../src/util/virterror.c
>> -	-(./apibuild.py)
>> +	-($(srcdir)/apibuild.py)
>
> Why the subshell?

I wondered the same thing.
I can see no way it would matter, so I'll remove it
as part of that patch:


>From 6d5aebcc2eb120e34d782c0740e607aecfb1900c Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering redhat com>
Date: Wed, 24 Feb 2010 14:18:40 +0100
Subject: [PATCH] build: avoid non-srcdir installation failure (apibuild.py)

* docs/Makefile.am (libvirt-api.xml): Insert missing "$(srcdir)/".
Also, remove unnecessary sub-shell.
---
 docs/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/docs/Makefile.am b/docs/Makefile.am
index cce7a48..9065ef1 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -131,7 +131,7 @@ devhelp/index.html devhelp/libvirt.devhelp: libvirt-api.xml $(devhelpxsl)
 libvirt-api.xml libvirt-refs.xml: apibuild.py \
 		$(srcdir)/../include/libvirt/*.h \
 		$(srcdir)/../src/libvirt.c $(srcdir)/../src/util/virterror.c
-	-(./apibuild.py)
+	-$(srcdir)/apibuild.py

 clean-local:
 	rm -f *~ *.bak *.hierarchy *.signals *-unused.txt
--
1.7.0.377.g90adb


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