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

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



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:

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

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

diff --git a/docs/Makefile.am b/docs/Makefile.am
index cce7a48..26b1d29 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.367.g566c3


>From 8e948091c4c3b2346be8ede0309ce768136621e9 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering redhat com>
Date: Wed, 24 Feb 2010 14:15:26 +0100
Subject: [PATCH 2/2] build: avoid non-srcdir installation failure (sitemap.html.in)

* docs/Makefile.am (EXTRA_DIST): Add sitemap.html.in.
---
 docs/Makefile.am |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 26b1d29..4828752 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -76,6 +76,7 @@ EXTRA_DIST=					\
   $(devhelphtml) $(devhelppng) $(devhelpcss) $(devhelpxsl) \
   $(xml) $(fig) $(png) \
   $(patches) \
+  sitemap.html.in \
   ChangeLog.awk

 CLEANFILES = $(dot_html) $(apihtml) $(devhelphtml)
--
1.7.0.367.g566c3


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