From 083b901eb3585e63273fe28214ca5c190fb38f0c 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/sexpr2xmldata/Makefile.am (EXTRA_DIST): Likewise.
* Makefile.am (XML_EXAMPLES): Use $(wildcard in $(srcdir)-aware manner.
---
 Makefile.am                     | 4 +++-
 tests/sexpr2xmldata/Makefile.am | 4 ++--
 tests/xencapsdata/Makefile.am   | 5 +++--
 tests/xmconfigdata/Makefile.am  | 4 ++--
 tests/xml2sexprdata/Makefile.am | 4 ++--
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a02cd26181..09439c8346 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,9 @@ SUBDIRS = gnulib/lib include src daemon tools proxy docs gnulib/tests \
 
 ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4
 
-XML_EXAMPLES = $(wildcard examples/xml/test/*.xml) $(wildcard examples/xml/storage/*.xml)
+XML_EXAMPLES = \
+  $(patsubst $(srcdir)/%,%,$(wildcard $(addprefix $(srcdir)/examples/xml/, \
+					test/*.xml storage/*.xml)))
 
 EXTRA_DIST = \
   ChangeLog-old \
diff --git a/tests/sexpr2xmldata/Makefile.am b/tests/sexpr2xmldata/Makefile.am
index 43117d5cb9..db43109ddf 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))
diff --git a/tests/xencapsdata/Makefile.am b/tests/xencapsdata/Makefile.am
index 7d775758f5..ed08bc421b 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 05201a087b..af0cb0917f 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 43117d5cb9..20028bbb21 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))