Permalink
Browse files

Avoid using $(top_srcdir) in TESTS.

Newer automakes don't like this.
  • Loading branch information...
1 parent ebf278b commit 2863c837007c9f28ae542663a6098c91e704b3ca Nick Mathewson committed Feb 9, 2013
Showing with 10 additions and 2 deletions.
  1. +2 −1 Makefile.am
  2. +8 −1 test/include.am
View
@@ -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
View
@@ -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

0 comments on commit 2863c83

Please sign in to comment.