Fix testsuite issues caught by distcheck.

Handle VPATH builds properly by dealing with testsuite in either
builddir or srcdir.  Also clean out configure-generated files on
distclean.

diff --git a/Makefile.am b/Makefile.am
index ecfc28c2b9e7904cf6d8239571fa506b89ce582b..de51272b2a816fe65ba039551db96539a727b8ea 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,7 @@ t_packtests_SOURCES = t/packtests.c src/pack.c src/tap.c
 t_packtestu64_SOURCES = t/packtestu64.c src/pack.c src/tap.c
 t_packtests64_SOURCES = t/packtests64.c src/pack.c src/tap.c
 
+DISTCLEANFILES =
 EXTRA_DIST =
 SUFFIXES =
 

diff --git a/snippet/autotest.mk b/snippet/autotest.mk
index b2baa2d09b4f45a2e5f019b636c9c9972898eb85..04643f13e7907fc910f7b15c127563d0a87cd02d 100644 (file)
--- a/snippet/autotest.mk
+++ b/snippet/autotest.mk
@@ -19,12 +19,14 @@
 
 check-local: check-autotest
 check-autotest: testsuite
-       $(SHELL) testsuite $(TESTSUITEFLAGS)
+       $(SHELL) $? $(TESTSUITEFLAGS)
 .PHONY: check-autotest
 
 clean-local: clean-autotest
 clean-autotest:
-       test ! -f testsuite || $(SHELL) testsuite --clean
+       for f in testsuite "$(srcdir)/testsuite"; do \
+         test ! -f "$$f" || { $(SHELL) "$$f" --clean; break; }; \
+       done
 .PHONY: clean-autotest
 
 maintainer-clean-local: maintainer-clean-autotest
@@ -62,4 +64,6 @@ endif
        $(AM_V_at) mv -f $@.tmp $@
 
 EXTRA_DIST += testsuite testsuite.at package.m4
+DISTCLEANFILES += atconfig $(DEPDIR)/testsuite.P
+
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testsuite.P@am__quote@