[libvirt] [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 <mprivozn(a)redhat.com>
---
docs/Makefile.am | 2 +-
examples/Makefile.am | 6 +++---
include/Makefile.am | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 5f531ea..fb53a45 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 50fc011..2adcefb 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 b3d2bff..bbf734a 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -18,7 +18,7 @@
virincdir = $(includedir)/libvirt
-allheaders = $(wildcard libvirt/*.h)
+allheaders = $(wildcard $(srcdir)/libvirt/*.h)
virinc_HEADERS = $(filter-out libvirt/libvirt-admin.h, $(allheaders))
EXTRA_DIST = libvirt/libvirt-common.h.in
--
2.4.10