commit 80a45835c4f8219dbbce20bed7ef534ba4718321 Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 21 12:03:05 2015 -0400

Is this the syntax that will make freebsd make happy? --- Makefile.am | 2 -- src/or/include.am | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am index 3e0ae3a..9b68d27 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,8 +25,6 @@ include src/include.am include doc/include.am include contrib/include.am

-export TESTING_TOR_BINARY - EXTRA_DIST+= \ ChangeLog \ INSTALL \ diff --git a/src/or/include.am b/src/or/include.am index 5566d3c..959b26d 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -123,9 +123,9 @@ src_or_tor_cov_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \ src/common/libor-event-testing.a src/trunnel/libor-trunnel-testing.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ -TESTING_TOR_BINARY = $(top_builddir)/src/or/tor-cov +export TESTING_TOR_BINARY = $(top_builddir)/src/or/tor-cov else -TESTING_TOR_BINARY = $(top_builddir)/src/or/tor +export TESTING_TOR_BINARY = $(top_builddir)/src/or/tor endif

ORHEADERS = \