aboutsummaryrefslogtreecommitdiff
path: root/src/integration-tests/Makefile.am
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 /src/integration-tests/Makefile.am
parentc7cbdf47e1cf85e04e1f229765f69b0b95cbc401 (diff)
downloadgnunet-611d42112112fe6e11df8a6417f3a0b69d97143f.tar.gz
gnunet-611d42112112fe6e11df8a6417f3a0b69d97143f.zip
Fix TESTS_ENVIRONMENT setting (allow GNUNET_PREFIX to be overriden, allow TESTS_ENVIRONMENT to be overrided (use AM_TESTS_ENVIRONMENT))
Diffstat (limited to 'src/integration-tests/Makefile.am')
-rw-r--r--src/integration-tests/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index 2bb97770c..74e7eed62 100644
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -26,7 +26,7 @@ endif
26 26
27if HAVE_MHD 27if HAVE_MHD
28if ENABLE_TEST_RUN 28if ENABLE_TEST_RUN
29TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; 29AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
30TESTS = \ 30TESTS = \
31 $(check_SCRIPTS) 31 $(check_SCRIPTS)
32endif 32endif