Avoid using $(top_srcdir) in TESTS.

Newer automakes don't like this.

diff --git a/Makefile.am b/Makefile.am
index 3040c2acfeabf9b4eafb9c0e12cd156edcd37414..baf15247c49edaf0e38ece388ad3498ec48e4f43 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -135,6 +135,7 @@ noinst_HEADERS=
 noinst_PROGRAMS=
 EXTRA_PROGRAMS=
 CLEANFILES=
+DISTCLEANFILES=
 BUILT_SOURCES =
 include include/include.am
 include sample/include.am
@@ -293,5 +294,5 @@ doxygen: FORCE
        doxygen $(srcdir)/Doxyfile
 FORCE:
 
-DISTCLEANFILES = *~ libevent.pc ./include/event2/event-config.h
+DISTCLEANFILES += *~ libevent.pc ./include/event2/event-config.h
 

diff --git a/test/include.am b/test/include.am
index 8954a9af2579bb83023c9aee22062532485f3e1b..82cfe4eb74bfb9eab909582da9ea6440aebcb78c 100644 (file)
--- a/test/include.am
+++ b/test/include.am
@@ -42,7 +42,14 @@ noinst_HEADERS+=                             \
        test/tinytest_local.h                   \
        test/tinytest_macros.h
 
-TESTS = $(top_srcdir)/test/test.sh
+# We need to copy this file, since automake doesn't want us to use top_srcdir
+# in TESTS.
+TESTS = test/test-script.sh
+
+test/test-script.sh: test/test.sh
+       cp $< $@
+
+DISTCLEANFILES += test/test-script.sh
 
 if BUILD_REGRESS
 BUILT_SOURCES += test/regress.gen.c test/regress.gen.h