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

Re: [libvirt] [PATCH] build: avoid non-srcdir "make distcheck" failures (XML_EXAMPLES)



Jim Meyering wrote:
> This avoids two of the 3 remaining failures,
>
>     -error: loading host definition file '/t/libvirt-0.7.6/examples/xml/test/testnode.xml': No such file or directory
>     -error: failed to connect to the hypervisor
>     +error: failed to get domain '4294967298'
>
>
>>From b2318b64abc8ac23b4fa43dc52d3c2a32226b8cb Mon Sep 17 00:00:00 2001
> From: Jim Meyering <meyering redhat com>
> Date: Wed, 24 Feb 2010 15:52:44 +0100
> Subject: [PATCH] build: avoid non-srcdir "make distcheck" failures (XML_EXAMPLES)
>
> * Makefile.am (XML_EXAMPLES): Use $(wildcard in $(srcdir)-aware manner.

Here's the fix for the final failure.

>From 8108279f354a61b31128c6fd9ca6facc1f3c93ab Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering redhat com>
Date: Wed, 24 Feb 2010 16:14:49 +0100
Subject: [PATCH]

---
 tests/sexpr2xmldata/Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/sexpr2xmldata/Makefile.am b/tests/sexpr2xmldata/Makefile.am
index 43117d5..db43109 100644
--- a/tests/sexpr2xmldata/Makefile.am
+++ b/tests/sexpr2xmldata/Makefile.am
@@ -1,2 +1,2 @@
-
-EXTRA_DIST = $(wildcard *.xml) $(wildcard *.sexpr)
+EXTRA_DIST = \
+   $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.xml $(srcdir)/*.sexpr))
--
1.7.0.367.g566c3



I'm squashing it and two others that are very similar into one.
Here's the resulting log message:

    build: avoid non-srcdir "make distcheck" failures (srcdir vs wildcard)

    * tests/xencapsdata/Makefile.am: Use $(wildcard in $(srcdir)-aware manner
    * tests/xmconfigdata/Makefile.am: Likewise.
    * tests/xml2sexprdata/Makefile.am: Likewise.
    * tests/sexpr2xmldata/Makefile.am (EXTRA_DIST): Likewise.
    * Makefile.am (XML_EXAMPLES): Use $(wildcard in $(srcdir)-aware manner.


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