aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-08-21 12:03:05 -0400
committerNick Mathewson <nickm@torproject.org>2015-08-21 12:03:05 -0400
commit80a45835c4f8219dbbce20bed7ef534ba4718321 (patch)
treed7d9cf924d5fa428f1f255915592a07dd8fdc7e9
parent848d21c24645cb4d1a6490ddec0f8e0cdb98da12 (diff)
downloadtor-80a45835c4f8219dbbce20bed7ef534ba4718321.tar.gz
tor-80a45835c4f8219dbbce20bed7ef534ba4718321.zip
Is this the syntax that will make freebsd make happy?
-rw-r--r--Makefile.am2
-rw-r--r--src/or/include.am4
2 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 3e0ae3a227..9b68d2752b 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 5566d3cd46..959b26dcf9 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 = \