build: Adjust tests to Automake 1.12.

* Makefile.am (TESTS_ENVIRONMENT): Remove `guile' invocation.  Add
  semicolons, and export the variables as shown in the Automake 1.12
  manual.
  (LOG_COMPILER): New variable, with `guile' invocation.

2 files changed, 7 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index 29879a56133..a211be98530 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ config.cache
 /po/stamp-po
 /po/guix.pot
 /guix-build
+/tests/*.trs
diff --git a/Makefile.am b/Makefile.am
index a096c9b95d4..8f8cb12c856 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,9 +48,12 @@ TESTS =						\
   tests/build-utils.scm                         \
   tests/packages.scm
 
-TESTS_ENVIRONMENT =                                                     \
-  NIXPKGS="$(NIXPKGS)"                                                  \
-  GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH" \
+TESTS_ENVIRONMENT =                                                             \
+  NIXPKGS="$(NIXPKGS)";                                                         \
+  GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH";        \
+  export NIXPKGS GUILE_LOAD_COMPILED_PATH;
+
+LOG_COMPILER =                                  \
   $(GUILE) --no-auto-compile -L "$(top_srcdir)"
 
 EXTRA_DIST = build-aux/config.rpath $(TESTS)