fix problem with recursive use of TESTS_ENVIRONMENT

diff --git a/test/Makefile.am b/test/Makefile.am
index 16fb4c1..82e016d 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -16,17 +16,19 @@
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 if FLaC__EXHAUSTIVE_TESTS
-TESTS_ENVIRONMENT = FLAC__EXHAUSTIVE_TESTS=yes
+FLAC__EXHAUSTIVE_TESTS = yes
 else
-TESTS_ENVIRONMENT = FLAC__EXHAUSTIVE_TESTS=no
+FLAC__EXHAUSTIVE_TESTS = no
 endif
 
 if FLaC__VALGRIND_TESTING
-TESTS_ENVIRONMENT = $(TESTS_ENVIRONMENT) FLAC__VALGRIND=yes
+FLAC__VALGRIND = yes
 else
-TESTS_ENVIRONMENT = $(TESTS_ENVIRONMENT) FLAC__VALGRIND=no
+FLAC__VALGRIND = no
 endif
 
+TESTS_ENVIRONMENT = FLAC__EXHAUSTIVE_TESTS=$(FLAC__EXHAUSTIVE_TESTS) FLAC__VALGRIND=$(FLAC__VALGRIND)
+
 SUBDIRS = cuesheets
 
 if FLaC__HAS_OGG