From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 12 Jan 2016 15:22:24 +0000 (+0100)
Subject: Expand $(wildcard) correctly
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8c67ab6684e984bcf7f4de3e6eee9d19b219a369;p=libvirt.git

Expand $(wildcard) correctly

So after da176bf6b756 and friend we have switched to $(wildcard
some/path/*.xml) instead of enumerating the files explicitly.
This is nice, however it makes distcheck build from VPATH fail.
The reason is that it's is not obvious to what does the wildcard
refer to: srcdir or builddir?

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 5f531ea336..fb53a45cbd 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -149,7 +149,7 @@ fig = \
   migration-unmanaged-direct.fig
 
 schemadir = $(pkgdatadir)/schemas
-schema_DATA = $(wildcard schemas/*.rng)
+schema_DATA = $(wildcard $(srcdir)/schemas/*.rng)
 
 EXTRA_DIST=					\
   apibuild.py genaclperms.pl \
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 50fc011885..2adcefb39e 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -16,7 +16,7 @@
 ## License along with this library.  If not, see
 ## <http://www.gnu.org/licenses/>.
 
-FILTERS = $(wildcard xml/nwfilter/*.xml)
+FILTERS = $(wildcard $(srcdir)/xml/nwfilter/*.xml)
 
 EXTRA_DIST = \
 	apparmor/TEMPLATE.qemu \
@@ -30,8 +30,8 @@ EXTRA_DIST = \
 	systemtap/events.stp \
 	systemtap/rpc-monitor.stp \
 	$(FILTERS) \
-	$(wildcard xml/storage/*.xml) \
-	$(wildcard xml/test/*.xml)
+	$(wildcard $(srcdir)/xml/storage/*.xml) \
+	$(wildcard $(srcdir)/xml/test/*.xml)
 
 
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir) \
diff --git a/include/Makefile.am b/include/Makefile.am
index b3d2bff05a..d6269632a5 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -18,8 +18,8 @@
 
 virincdir = $(includedir)/libvirt
 
-allheaders = $(wildcard libvirt/*.h)
-virinc_HEADERS = $(filter-out libvirt/libvirt-admin.h, $(allheaders))
+allheaders = $(wildcard $(srcdir)/libvirt/*.h)
+virinc_HEADERS = $(filter-out $(srcdir)/libvirt/libvirt-admin.h, $(allheaders))
 
 EXTRA_DIST = libvirt/libvirt-common.h.in