summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLRN <lrn1986@gmail.com>2014-02-02 17:11:17 +0000
committerLRN <lrn1986@gmail.com>2014-02-02 17:11:17 +0000
commit611d42112112fe6e11df8a6417f3a0b69d97143f (patch)
tree313e787c8f7def8d6c2773bcf8b4bc3df6b3d633 /contrib
parentc7cbdf47e1cf85e04e1f229765f69b0b95cbc401 (diff)
Fix TESTS_ENVIRONMENT setting (allow GNUNET_PREFIX to be overriden, allow TESTS_ENVIRONMENT to be overrided (use AM_TESTS_ENVIRONMENT))
Diffstat (limited to 'contrib')
-rw-r--r--contrib/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index c8d301e67..f36922b20 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -83,7 +83,7 @@ check_PROGRAMS = \
test_gnunet_prefix
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 = $(check_PROGRAMS)
endif