- update default values, eliminate obsolete ones

[oweals/gnunet.git] / src / testbed / Makefile.am

diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index 209894be78e279df01412352979acc0b6bcb9721..a87ff5817f80e0e77a95138c7343272c458b055d 100644 (file)
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -193,7 +193,7 @@ check_PROGRAMS = \
   $(underlay_testcases)
 
 if ENABLE_TEST_RUN
- TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
+ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
  TESTS = \
   test_testbed_api \
   test_testbed_logger_api \
@@ -400,7 +400,7 @@ test_testbed_api_barriers_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettestbed.la
 test_testbed_api_barriers_DEPENDENCIES = \
- gnunet-service-test-barriers
+ gnunet-service-test-barriers$(EXEEXT)
 
 gnunet_service_test_barriers_SOURCES = \
   gnunet-service-test-barriers.c \
@@ -417,6 +417,7 @@ test_testbed_underlay_LDADD = \
 
 EXTRA_DIST = \
   test_testbed_api.conf \
+  test_testbed_api_statistics.conf \
   test_testbed_api_test_timeout.conf \
   test_testbed_api_template.conf \
   test_testbed_logger_api.conf \