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

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



With this, I'm down to 3 of 43 test failures.

>From dd6f73de8afe2bcac80cc0a5b7f60bc83e0e30fc Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering redhat com>
Date: Wed, 24 Feb 2010 15:18:51 +0100
Subject: [PATCH] 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/xencapsdata/Makefile.am   |    5 +++--
 tests/xmconfigdata/Makefile.am  |    4 ++--
 tests/xml2sexprdata/Makefile.am |    4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/tests/xencapsdata/Makefile.am b/tests/xencapsdata/Makefile.am
index 7d77575..ed08bc4 100644
--- a/tests/xencapsdata/Makefile.am
+++ b/tests/xencapsdata/Makefile.am
@@ -1,2 +1,3 @@
-
-EXTRA_DIST = $(wildcard *.xml) $(wildcard *.cpuinfo) $(wildcard *.caps)
+EXTRA_DIST = \
+  $(patsubst $(srcdir)/%,%,$(wildcard \
+    $(srcdir)/*.xml $(srcdir)/*.cpuinfo $(srcdir)/*.caps))
diff --git a/tests/xmconfigdata/Makefile.am b/tests/xmconfigdata/Makefile.am
index 05201a0..af0cb09 100644
--- a/tests/xmconfigdata/Makefile.am
+++ b/tests/xmconfigdata/Makefile.am
@@ -1,2 +1,2 @@
-
-EXTRA_DIST = $(wildcard *.xml) $(wildcard *.cfg)
+EXTRA_DIST = \
+  $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.xml $(srcdir)/*.cfg))
diff --git a/tests/xml2sexprdata/Makefile.am b/tests/xml2sexprdata/Makefile.am
index 43117d5..20028bb 100644
--- a/tests/xml2sexprdata/Makefile.am
+++ b/tests/xml2sexprdata/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


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