From Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>

* tests/Makefile.am (TESTS_ENVIRONMENT): Make sure the *.test
scripts get the same make that was used in the top level
directory.

diff --git a/ChangeLog b/ChangeLog
index 0d65ed0570ff0ff79d37aac4cd31ab89f216d31a..002a8b72f5df56134efcbab971e58929cfc81773 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-24  Gary V. Vaughan  <gvv@techie.com>
+
+       From Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>
+       * tests/Makefile.am (TESTS_ENVIRONMENT): Make sure the *.test
+       scripts get the same make that was used in the top level
+       directory.
+
 2001-04-23  Peter Eisentraut  <peter_e@gmx.net>
 
        * libltdl/ltdl.c (lt_dlexit): Quit loop if only resident modules

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 430291932b640ba8b9aa74a6a4cb22268734b44b..36fde5d2a266c9bf1784b06d86941e15442435be 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -59,9 +59,9 @@ LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 
 # Be sure to reexport important environment variables.
-TESTS_ENVIRONMENT = CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
-       LD="$(LD)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" \
-       LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)"
+TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \
+       CPPFLAGS="$(CPPFLAGS)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" \
+       LIBS="$(LIBS)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)"
 
 EXTRA_DIST = defs $(COMMON_TESTS) $(CXX_TESTS)