From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 9 Jun 2010 13:20:58 +0000 (+0200)
Subject: Tests defs: remove variable $testaclocaldir.
X-Git-Tag: ng-0.5a~351^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adba8e96113e4883ec568babd14709538fc696c6;p=thirdparty%2Fautomake.git

Tests defs: remove variable $testaclocaldir.

* tests/defs.in ($testaclocaldir): Removed.
* tests/aclocal.test: Use `$top_testsrcdir/m4' directly, no
t `$testaclocaldir'.
---

diff --git a/ChangeLog b/ChangeLog
index 2b41e2bd0..42e97f6d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-09-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
+	Tests defs: remove variable $testaclocaldir.
+	* tests/defs.in ($testaclocaldir): Removed.
+	* tests/aclocal.test: Use `$top_testsrcdir/m4' directly, not
+	`$testaclocaldir'.
+
 	Tests defs: $srcdir and $top_srcdir renaming.
 	* tests/defs.in ($srcdir): Remove, define $testsrcdir directly.
 	* tests/Makefile.am ($(parallel_tests)): Generation of derived
diff --git a/tests/aclocal.test b/tests/aclocal.test
index da80d0887..3e78df909 100755
--- a/tests/aclocal.test
+++ b/tests/aclocal.test
@@ -41,6 +41,6 @@ grep '[Tt]ry.*--help.*for more information' stderr
 
 $ACLOCAL --versi
 
-test "`$ACLOCAL --print-ac-dir`" = "$testaclocaldir"
+test x"`$ACLOCAL --print-ac-dir`" = x"$top_testsrcdir/m4"
 
 :
diff --git a/tests/defs.in b/tests/defs.in
index 7f6807c97..f73edd429 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -371,8 +371,6 @@ case " $required " in
     ;;
 esac
 
-testaclocaldir=$top_testsrcdir/m4
-
 # POSIX no longer requires 'egrep' and 'fgrep',
 # but some hosts lack 'grep -E' and 'grep -F'.
 EGREP='@EGREP@'