From 2863c837007c9f28ae542663a6098c91e704b3ca Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 8 Feb 2013 22:10:05 -0500
Subject: [PATCH] Avoid using $(top_srcdir) in TESTS.

Newer automakes don't like this.
---
 Makefile.am     | 3 ++-
 test/include.am | 9 ++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 3040c2acfe..baf15247c4 100644
--- 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 8954a9af25..82cfe4eb74 100644
--- 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