From 611d42112112fe6e11df8a6417f3a0b69d97143f Mon Sep 17 00:00:00 2001
From: LRN <lrn1986@gmail.com>
Date: Sun, 2 Feb 2014 17:11:17 +0000
Subject: Fix TESTS_ENVIRONMENT setting (allow GNUNET_PREFIX to be overriden,
 allow TESTS_ENVIRONMENT to be overrided (use AM_TESTS_ENVIRONMENT))

---
 src/testbed/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/testbed/Makefile.am')

diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index e9e537515..b3a8260c4 100644
--- 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=@libdir@;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 \
-- 
cgit v1.2.3