Use variables instead of substitutions

Using variables removes the ambiguity about when to use variables and
when to use substitutions. Variables always work. Substitutions only
work when Autoconf knows about them which is not always the case.

The variables are also placed between quotes to ensures spaces in the
variables are handled properly.

diff --git a/src/test/include.am b/src/test/include.am
index a24c5bb1b47b2d5b9a3165980e33a62469358785..9577e1e80f0b80196cbcb896b1719f2dc6c13526 100644 (file)
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -1,8 +1,8 @@
 AM_TESTS_ENVIRONMENT = \
-       export PYTHON=@PYTHON@; \
-       export SHELL=@SHELL@; \
-       export abs_top_srcdir=@abs_top_srcdir@; \
-       export builddir=@builddir@; \
+       export PYTHON="$(PYTHON)"; \
+       export SHELL="$(SHELL)"; \
+       export abs_top_srcdir="$(abs_top_srcdir)"; \
+       export builddir="$(builddir)"; \
        export TESTING_TOR_BINARY="$(TESTING_TOR_BINARY)";
 
 TESTSCRIPTS = src/test/test_zero_length_keys.sh