make distcheck work

Makefile.am

@@ -4,6 +4,8 @@ vmod_cluster_vcl_DATA = \
 	vcl/vshard.inc.vcl \
 	vcl/vshard_probe.inc.vcl
 
+EXTRA_DIST = $(vmod_cluster_vcl_DATA)
+
 DISTCHECK_CONFIGURE_FLAGS = RST2MAN=:
 
 SUBDIRS = src

src/Makefile.am

@@ -6,13 +6,15 @@ vmod_LTLIBRARIES = \
 	libvmod_cluster.la
 
 libvmod_cluster_la_LDFLAGS = $(VMOD_LDFLAGS)
-libvmod_cluster_la_SOURCES = vmod_cluster.c
-nodist_libvmod_cluster_la_SOURCES = \
-	vcc_cluster_if.c \
-	vcc_cluster_if.h \
+libvmod_cluster_la_SOURCES = \
+	vmod_cluster.c \
 	tbl_resolve.h \
 	vmod_compat.h
 
+nodist_libvmod_cluster_la_SOURCES = \
+	vcc_cluster_if.c \
+	vcc_cluster_if.h
+
 @BUILD_VMOD_CLUSTER@
 
 # Test suite
@@ -24,7 +26,7 @@ TEST_EXTENSIONS = .vtc
 VTC_LOG_COMPILER = varnishtest -v
 AM_VTC_LOG_FLAGS = \
 	-p vcl_path="$(abs_top_srcdir)/vcl" \
-	-p vmod_path="$(abs_builddir)/.libs:$(vmoddir)"
+	-p vmod_path="$(abs_builddir)/.libs:$(vmoddir):$(VARNISHAPI_VMODDIR)"
 
 TESTS = \
 	vtc/cfg.vtc		\