A VPATH build 'make check' was failing with:
GEN check-driverimpls
Can't open ../../src/../../src/lxc/lxc_monitor_protocol.h: No such file or
directory at ../../src/check-driverimpls.pl line 29, <> line 27153.
Can't open ../../src/../../src/lxc/lxc_monitor_protocol.c: No such file or
directory at ../../src/check-driverimpls.pl line 29, <> line 27153.
...
GEN check-aclrules
cannot read ../../src/../../src/remote/remote_protocol.x at
../../src/check-aclrules.pl line 128.
because $(srcdir) was being prepended to file names that already
included it.
* src/Makefile.am (check-driverimpls): Don't add srcdir twice.
Signed-off-by: Eric Blake <ebl...@redhat.com>
---
Pushing under the build-breaker rule.
src/Makefile.am | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 84372cb..62e427e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -499,11 +499,13 @@ STATEFUL_DRIVER_SOURCE_FILES = \
check-driverimpls:
$(AM_V_GEN)$(PERL) $(srcdir)/check-driverimpls.pl \
$(filter /%,$(DRIVER_SOURCE_FILES)) \
- $(addprefix $(srcdir)/,$(filter-out /%,$(DRIVER_SOURCE_FILES)))
+ $(filter $(srcdir)/%,$(DRIVER_SOURCE_FILES)) \
+ $(addprefix $(srcdir)/,$(filter-out $(srcdir)/%, \
+ $(filter-out /%,$(DRIVER_SOURCE_FILES))))
check-aclrules:
$(AM_V_GEN)$(PERL) $(srcdir)/check-aclrules.pl \
- $(addprefix $(srcdir)/,$(filter-out /%,$(REMOTE_PROTOCOL))) \
+ $(REMOTE_PROTOCOL) \
$(addprefix $(srcdir)/,$(filter-out
/%,$(STATEFUL_DRIVER_SOURCE_FILES)))
EXTRA_DIST += check-driverimpls.pl check-aclrules.pl
--
1.8.3.1
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
