From 8c67ab6684e984bcf7f4de3e6eee9d19b219a369 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Tue, 12 Jan 2016 16:22:24 +0100 Subject: [PATCH] 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 --- docs/Makefile.am | 2 +- examples/Makefile.am | 6 +++--- include/Makefile.am | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) 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 ## . -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