Update after gnulib changed.

* gettext-tools/tests/Makefile.am (TESTS_ENVIRONMENT): Define top_builddir,
consistently with Gnulib.
* gettext-tools/tests/init-env.in (top_builddir): Remove definition here.

diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
index 9f54c706ab0d69fb81956ed6c635a2045784391f..77034ae8db19fa6f602fd7dbab7de2074de5f436 100644 (file)
--- a/gettext-tools/tests/Makefile.am
+++ b/gettext-tools/tests/Makefile.am
@@ -334,6 +334,13 @@ TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) \
                    RECODE="$(CHECKER) recode" \
                    CONFIG_SHELL='$(SHELL)'
 
+# The value of top_builddir, determined by Autoconf and stored in the Makefile,
+# consists of n times '..', where n is the depth of the $(srcdir) under
+# $(top_srcdir). Here we need one more '..', because the test framework
+# (init.sh) arranges to run the tests in a subdirectory of depth 1 under the
+# directory where the Makefile sits.
+TESTS_ENVIRONMENT += top_builddir='../@top_builddir@'
+
 # Invoke the shell explicitly, because the execute-permission bit on the scripts
 # may get lost in particular circumstances (e.g. when unpacking a tarball, or
 # under Cygwin).

diff --git a/gettext-tools/tests/init-env.in b/gettext-tools/tests/init-env.in
index 63af1972432db2cfb614b666543ba0d4c866707c..d3b60de2b48eb91287c09b2164cee02efcf63898 100644 (file)
--- a/gettext-tools/tests/init-env.in
+++ b/gettext-tools/tests/init-env.in
@@ -1,5 +1,5 @@
-# Variable needed by LTLIBINTL.
-top_builddir=../..
+# Note: LTLIBINTL uses the variable ${top_builddir}, whose value is set
+# as an environment variable by the 'test-framework-sh' module.
 
 OBJEXT="@OBJEXT@"
 EXEEXT="@EXEEXT@"