Small tweaks.

diff --git a/ChangeLog b/ChangeLog
index 61bfee828fae4d70c4229d7a8a7a4e1bd34c33db..c1a4685425ed659d99af2e5b5207a6512a2c01d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-10-16  Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-tool (func_emit_tests_Makefile_am): Also define
+       TESTS_ENVIRONMENT, so that individual tests can augment it.
+
+       * gnulib-tool (func_create_testdir): Use an intermediate target for
+       building $(BUILT_SOURCES). Needed because BUILT_SOURCES can contain
+       macros, like $(ALLOCA_H), which cannot be passed through the command
+       line.
+
 2005-10-15  Simon Josefsson  <jas@extundo.com>
 
        * modules/rijndael-tests: New file.

diff --git a/gnulib-tool b/gnulib-tool
index 8cf563eb7a0591c2ff9f9e5465145b98e6151176..8da22f7f9c286cf923e5846537ad0b8649e8d2aa 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2005-09-20 11:48:17 $'
+cvsdatestamp='$Date: 2005-10-17 10:27:37 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -725,6 +725,7 @@ func_emit_tests_Makefile_am ()
   echo "ACLOCAL_AMFLAGS = -I ${testsbase_inverse}/${m4base}"
   echo
   echo "TESTS ="
+  echo "TESTS_ENVIRONMENT ="
   echo "noinst_PROGRAMS ="
   echo "EXTRA_DIST ="
   echo "BUILT_SOURCES ="
@@ -1517,7 +1518,8 @@ func_create_testdir ()
        cd lib
        built_sources=`grep '^BUILT_SOURCES *=' Makefile.in | sed -e 's/^BUILT_SOURCES *=//'`
        if test -n "$built_sources"; then
-         make $built_sources
+         echo 'built_sources: $(BUILT_SOURCES)' >> Makefile
+         make built_sources
        fi
        cd ..
      make distclean