From a55514eeed96b9bf9a16fbed1a709dfcce5a6080 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 8 Feb 2013 22:08:18 -0500
Subject: [PATCH] Avoid using top_srcdir in TESTS-new automakes do not like
 this

---
 test/Makefile.am | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/test/Makefile.am b/test/Makefile.am
index b10c41a8..0253a491 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -19,7 +19,14 @@ endif
 EXTRA_PROGRAMS = regress
 noinst_HEADERS = tinytest.h tinytest_macros.h regress.h tinytest_local.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-script.sh
+
+test-script.sh: test.sh
+	cp $< $@
+
+DISTCLEANFILES = test-script.sh
 
 BUILT_SOURCES =
 if BUILD_REGRESS
@@ -91,7 +98,7 @@ rpcgen-attempted: $(srcdir)/regress.rpc $(srcdir)/../event_rpcgen.py $(srcdir)/r
 
 CLEANFILES = rpcgen-attempted
 
-DISTCLEANFILES = *~
+DISTCLEANFILES += *~
 
 verify: check
 
-- 
2.50.1