* tests/defs: Changed how ACLOCAL and AUTOMAKE are set.

diff --git a/ChangeLog b/ChangeLog
index 7a68a1e725243c0c502367c97436b595f360c7ab..12f0c0eefdeabb5b0f4d51dd20784aee39fb68cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-10  Tom Tromey  <tromey@redhat.com>
+
+       * tests/defs: Changed how ACLOCAL and AUTOMAKE are set.
+
 2001-04-10  Derek R. Price  <dprice@collab.net>
 
        * tests/defs: Allow user to override AUTOMAKE and ACLOCAL.

diff --git a/tests/defs b/tests/defs
index 1764d950e85a6745c820c84661aeddeacef67278..6a162e317628ab1f24fe732d29b6bdedffe70b1e 100644 (file)
--- a/tests/defs
+++ b/tests/defs
@@ -71,7 +71,9 @@ echo "=== Running test $0"
 # See how Automake should be run.  We put --foreign as the default
 # strictness to avoid having to create lots and lots of files.  A test
 # can override this by specifying a different strictness.
-: ${AUTOMAKE-"$PERL ../../automake --amdir=$srcdir/.. --foreign"}
+test -z "$AUTOMAKE" \
+   && AUTOMAKE="$PERL ../../automake --amdir=$srcdir/.. --foreign"
 
 # See how aclocal should be run.
-: ${ACLOCAL-"$PERL ../../aclocal --acdir=$srcdir/../m4"}
+test -z "$ACLOCAL" \
+   && ACLOCAL="$PERL ../../aclocal --acdir=$srcdir/../m4"