From: Daiki Ueno <ueno@gnu.org>
Date: Wed, 10 Jul 2013 08:14:57 +0000 (+0900)
Subject: gettext-tools: convert tests to use init.sh from Gnulib
X-Git-Tag: v0.19~195
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c0abd26de617b218e86360885c1a6674fe1a4ea;p=thirdparty%2Fgettext.git

gettext-tools: convert tests to use init.sh from Gnulib
---

diff --git a/ChangeLog b/ChangeLog
index 6a96e1b82..4da5b809c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-10  Daiki Ueno  <ueno@gnu.org>
+
+	gettext-tools: convert tests to use init.sh from Gnulib
+	* autogen.sh: Copy tests/init.sh from Gnulib into gettext-tools/tests.
+
 2013-07-07  Daiki Ueno  <ueno@gnu.org>
 
 	* NEWS: Mention libasprintf change and Tcl bug fix.
diff --git a/autogen.sh b/autogen.sh
index a1033b651..013220890 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -378,6 +378,7 @@ if ! $skip_gnulib; then
     '
     $GNULIB_TOOL --dir=gettext-tools --source-base=libgettextpo --m4-base=libgettextpo/gnulib-m4 --macro-prefix=gtpo --makefile-name=Makefile.gnulib --libtool --local-dir=gnulib-local --local-symlink \
       --import $GNULIB_MODULES_LIBGETTEXTPO $GNULIB_MODULES_LIBGETTEXTPO_OTHER
+    $GNULIB_TOOL --copy-file tests/init.sh gettext-tools
   fi
 fi
 
diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index f5dba31fb..40cf53136 100644
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,11 @@
+2013-07-10  Daiki Ueno  <ueno@gnu.org>
+
+	gettext-tools: convert tests to use init.sh from Gnulib
+	* Makefile.am (TESTS_ENVIRONMENT): Don't define LIBTOOL envvar
+	since it contains a relative path which cannot easily modified by
+	init.sh-using tests.  Set it in the tests instead.
+	* *: convert to use init.sh.
+
 2013-07-07  Daiki Ueno  <ueno@gnu.org>
 
 	* lang-javascript: Fix gjs module checks.
diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
index 37e7bbc6f..d4f258436 100644
--- a/gettext-tools/tests/Makefile.am
+++ b/gettext-tools/tests/Makefile.am
@@ -179,7 +179,6 @@ TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) \
 		    MSGUNIQ="$(CHECKER) msguniq" \
 		    RECODE="$(CHECKER) recode" \
 		    OBJEXT='@OBJEXT@' EXEEXT='@EXEEXT@' \
-		    LIBTOOL='@LIBTOOL@' \
 		    CC='@CC@' CFLAGS='@CFLAGS@' \
 		    CXX='@CXX@' CXXFLAGS='@CXXFLAGS@' \
 		    CPPFLAGS='@CPPFLAGS@' LDFLAGS='@LDFLAGS@' \
diff --git a/gettext-tools/tests/format-awk-1 b/gettext-tools/tests/format-awk-1
index 3228eb16e..217076520 100755
--- a/gettext-tools/tests/format-awk-1
+++ b/gettext-tools/tests/format-awk-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of awk format strings.
 
diff --git a/gettext-tools/tests/format-awk-2 b/gettext-tools/tests/format-awk-2
index f16ec3f3c..6f4870b7a 100755
--- a/gettext-tools/tests/format-awk-2
+++ b/gettext-tools/tests/format-awk-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of awk format strings.
 
diff --git a/gettext-tools/tests/format-boost-1 b/gettext-tools/tests/format-boost-1
index 34009c433..2ab97a674 100755
--- a/gettext-tools/tests/format-boost-1
+++ b/gettext-tools/tests/format-boost-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Boost format strings.
 
diff --git a/gettext-tools/tests/format-boost-2 b/gettext-tools/tests/format-boost-2
index aebdd5296..1c7340ff5 100755
--- a/gettext-tools/tests/format-boost-2
+++ b/gettext-tools/tests/format-boost-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Boost format strings.
 
diff --git a/gettext-tools/tests/format-c-1 b/gettext-tools/tests/format-c-1
index 93115a6e8..01d936285 100755
--- a/gettext-tools/tests/format-c-1
+++ b/gettext-tools/tests/format-c-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of C format strings.
 
diff --git a/gettext-tools/tests/format-c-2 b/gettext-tools/tests/format-c-2
index 2f68a6332..7c47c193f 100755
--- a/gettext-tools/tests/format-c-2
+++ b/gettext-tools/tests/format-c-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of C format strings.
 
diff --git a/gettext-tools/tests/format-c-3 b/gettext-tools/tests/format-c-3
index 1e9842274..9c8082bb4 100755
--- a/gettext-tools/tests/format-c-3
+++ b/gettext-tools/tests/format-c-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test ISO C 99 <inttypes.h> format string directives.
 
@@ -7,7 +8,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles fc3.tmp fc3.pot"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o fc3.tmp --omit-header --no-location ${top_srcdir}/tests/format-c-3-prg.c
+${XGETTEXT} -o fc3.tmp --omit-header --no-location ../${srcdir}/format-c-3-prg.c
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < fc3.tmp > fc3.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
@@ -47,7 +48,7 @@ test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 : ${DIFF=diff}
 ${DIFF} fc3-de.po fc3-de.po.un || exit 1
 
-LANGUAGE= ./fc3 de_DE
+LANGUAGE= ../fc3 de_DE
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/format-c-4 b/gettext-tools/tests/format-c-4
index aef04d5e0..6a34a84f4 100755
--- a/gettext-tools/tests/format-c-4
+++ b/gettext-tools/tests/format-c-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test ISO C 99 <inttypes.h> format string directives with plural forms.
 
@@ -7,7 +8,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles fc4.tmp fc4.pot"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o fc4.tmp --omit-header --no-location ${top_srcdir}/tests/format-c-4-prg.c
+${XGETTEXT} -o fc4.tmp --omit-header --no-location ../${srcdir}/format-c-4-prg.c
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < fc4.tmp > fc4.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
@@ -51,7 +52,7 @@ test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 : ${DIFF=diff}
 ${DIFF} fc4-de.po fc4-de.po.un || exit 1
 
-LANGUAGE= ./fc4 de_DE
+LANGUAGE= ../fc4 de_DE
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/format-c-5 b/gettext-tools/tests/format-c-5
index 666aea243..997d4d6a8 100755
--- a/gettext-tools/tests/format-c-5
+++ b/gettext-tools/tests/format-c-5
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test 'I' format directive flag.
 
@@ -7,7 +8,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles fc5.tmp fc5.pot"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o fc5.tmp --omit-header --no-location ${top_srcdir}/tests/format-c-5-prg.c
+${XGETTEXT} -o fc5.tmp --omit-header --no-location ../${srcdir}/format-c-5-prg.c
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < fc5.tmp > fc5.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
@@ -47,7 +48,7 @@ test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 : ${DIFF=diff}
 ${DIFF} fa.po fa.po.un || exit 1
 
-LANGUAGE= ./fc5 fa_IR
+LANGUAGE= ../fc5 fa_IR
 case $? in
   0) ;;
   77)
diff --git a/gettext-tools/tests/format-csharp-1 b/gettext-tools/tests/format-csharp-1
index c6ed6068e..9db113443 100755
--- a/gettext-tools/tests/format-csharp-1
+++ b/gettext-tools/tests/format-csharp-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of C# format strings.
 
diff --git a/gettext-tools/tests/format-csharp-2 b/gettext-tools/tests/format-csharp-2
index 9180bc1c4..4cc8bebd5 100755
--- a/gettext-tools/tests/format-csharp-2
+++ b/gettext-tools/tests/format-csharp-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Java format strings.
 
diff --git a/gettext-tools/tests/format-elisp-1 b/gettext-tools/tests/format-elisp-1
index 0c7c4c9ca..1d7289a1d 100755
--- a/gettext-tools/tests/format-elisp-1
+++ b/gettext-tools/tests/format-elisp-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Emacs Lisp format strings.
 
diff --git a/gettext-tools/tests/format-elisp-2 b/gettext-tools/tests/format-elisp-2
index e5516e256..dde86c385 100755
--- a/gettext-tools/tests/format-elisp-2
+++ b/gettext-tools/tests/format-elisp-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Emacs Lisp format strings.
 
diff --git a/gettext-tools/tests/format-gcc-internal-1 b/gettext-tools/tests/format-gcc-internal-1
index 3bd8f35b3..54fef564e 100755
--- a/gettext-tools/tests/format-gcc-internal-1
+++ b/gettext-tools/tests/format-gcc-internal-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of GCC internal format strings.
 
diff --git a/gettext-tools/tests/format-gcc-internal-2 b/gettext-tools/tests/format-gcc-internal-2
index 55725d135..a5f92c01e 100755
--- a/gettext-tools/tests/format-gcc-internal-2
+++ b/gettext-tools/tests/format-gcc-internal-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of GCC internal format strings.
 
diff --git a/gettext-tools/tests/format-gfc-internal-1 b/gettext-tools/tests/format-gfc-internal-1
index 42bf8a077..69ef28bc1 100755
--- a/gettext-tools/tests/format-gfc-internal-1
+++ b/gettext-tools/tests/format-gfc-internal-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of GFC internal format strings.
 
diff --git a/gettext-tools/tests/format-gfc-internal-2 b/gettext-tools/tests/format-gfc-internal-2
index 3332e5388..42c1b30c3 100755
--- a/gettext-tools/tests/format-gfc-internal-2
+++ b/gettext-tools/tests/format-gfc-internal-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of GFC internal format strings.
 
diff --git a/gettext-tools/tests/format-java-1 b/gettext-tools/tests/format-java-1
index 697c683ae..6a694b493 100755
--- a/gettext-tools/tests/format-java-1
+++ b/gettext-tools/tests/format-java-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Java format strings.
 
diff --git a/gettext-tools/tests/format-java-2 b/gettext-tools/tests/format-java-2
index c7e1b605e..580bddcc9 100755
--- a/gettext-tools/tests/format-java-2
+++ b/gettext-tools/tests/format-java-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Java format strings.
 
diff --git a/gettext-tools/tests/format-javascript-1 b/gettext-tools/tests/format-javascript-1
index f632d1a2c..f747aabbd 100755
--- a/gettext-tools/tests/format-javascript-1
+++ b/gettext-tools/tests/format-javascript-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of JavaScript format strings.
 
diff --git a/gettext-tools/tests/format-javascript-2 b/gettext-tools/tests/format-javascript-2
index 3dfcfc821..6a9642db6 100755
--- a/gettext-tools/tests/format-javascript-2
+++ b/gettext-tools/tests/format-javascript-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of JavaScript format strings.
 
diff --git a/gettext-tools/tests/format-kde-1 b/gettext-tools/tests/format-kde-1
index f916b3faa..5752c63f8 100755
--- a/gettext-tools/tests/format-kde-1
+++ b/gettext-tools/tests/format-kde-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of KDE format strings.
 
diff --git a/gettext-tools/tests/format-kde-2 b/gettext-tools/tests/format-kde-2
index 423fcefb5..9b9bb98df 100755
--- a/gettext-tools/tests/format-kde-2
+++ b/gettext-tools/tests/format-kde-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of KDE format strings.
 
diff --git a/gettext-tools/tests/format-librep-1 b/gettext-tools/tests/format-librep-1
index ddf97c3b0..0fe2ec145 100755
--- a/gettext-tools/tests/format-librep-1
+++ b/gettext-tools/tests/format-librep-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of librep format strings.
 
diff --git a/gettext-tools/tests/format-librep-2 b/gettext-tools/tests/format-librep-2
index 05d26ab3a..52db5382e 100755
--- a/gettext-tools/tests/format-librep-2
+++ b/gettext-tools/tests/format-librep-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of librep format strings.
 
diff --git a/gettext-tools/tests/format-lisp-1 b/gettext-tools/tests/format-lisp-1
index d23256c9f..81ae3d518 100755
--- a/gettext-tools/tests/format-lisp-1
+++ b/gettext-tools/tests/format-lisp-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Lisp format strings.
 
diff --git a/gettext-tools/tests/format-lisp-2 b/gettext-tools/tests/format-lisp-2
index 6ad8ddd53..7bc35e0a4 100755
--- a/gettext-tools/tests/format-lisp-2
+++ b/gettext-tools/tests/format-lisp-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Lisp format strings.
 
diff --git a/gettext-tools/tests/format-lua-1 b/gettext-tools/tests/format-lua-1
index 722a6e095..42b851548 100755
--- a/gettext-tools/tests/format-lua-1
+++ b/gettext-tools/tests/format-lua-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Lua format strings.
 
diff --git a/gettext-tools/tests/format-lua-2 b/gettext-tools/tests/format-lua-2
index 6e38bf60f..17e32cc72 100755
--- a/gettext-tools/tests/format-lua-2
+++ b/gettext-tools/tests/format-lua-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Python format strings.
 
diff --git a/gettext-tools/tests/format-pascal-1 b/gettext-tools/tests/format-pascal-1
index 1439c283d..4d2875be0 100755
--- a/gettext-tools/tests/format-pascal-1
+++ b/gettext-tools/tests/format-pascal-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Object Pascal format strings.
 
diff --git a/gettext-tools/tests/format-pascal-2 b/gettext-tools/tests/format-pascal-2
index 8f6cefe47..a0967fd9f 100755
--- a/gettext-tools/tests/format-pascal-2
+++ b/gettext-tools/tests/format-pascal-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Object Pascal format strings.
 
diff --git a/gettext-tools/tests/format-perl-1 b/gettext-tools/tests/format-perl-1
index 878a7ed5a..cf666b239 100755
--- a/gettext-tools/tests/format-perl-1
+++ b/gettext-tools/tests/format-perl-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Perl format strings.
 
diff --git a/gettext-tools/tests/format-perl-2 b/gettext-tools/tests/format-perl-2
index 9382fd7c0..12f0d7090 100755
--- a/gettext-tools/tests/format-perl-2
+++ b/gettext-tools/tests/format-perl-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Perl format strings.
 
diff --git a/gettext-tools/tests/format-perl-brace-1 b/gettext-tools/tests/format-perl-brace-1
index e78266f69..23ec18550 100755
--- a/gettext-tools/tests/format-perl-brace-1
+++ b/gettext-tools/tests/format-perl-brace-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Perl brace format strings.
 
diff --git a/gettext-tools/tests/format-perl-brace-2 b/gettext-tools/tests/format-perl-brace-2
index c00636bfa..3654f6aa3 100755
--- a/gettext-tools/tests/format-perl-brace-2
+++ b/gettext-tools/tests/format-perl-brace-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Perl brace format strings.
 
diff --git a/gettext-tools/tests/format-perl-mixed-1 b/gettext-tools/tests/format-perl-mixed-1
index 89147088c..ffbdf264a 100755
--- a/gettext-tools/tests/format-perl-mixed-1
+++ b/gettext-tools/tests/format-perl-mixed-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Perl format strings of both kinds (printf and brace).
 # This test is for the combination of both kinds.
diff --git a/gettext-tools/tests/format-perl-mixed-2 b/gettext-tools/tests/format-perl-mixed-2
index 09afbbb5b..5337eb988 100755
--- a/gettext-tools/tests/format-perl-mixed-2
+++ b/gettext-tools/tests/format-perl-mixed-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Perl format strings.
 # This test is for the combination of printf and brace format strings.
diff --git a/gettext-tools/tests/format-php-1 b/gettext-tools/tests/format-php-1
index 9efb3a541..2763040ee 100755
--- a/gettext-tools/tests/format-php-1
+++ b/gettext-tools/tests/format-php-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of PHP format strings.
 
diff --git a/gettext-tools/tests/format-php-2 b/gettext-tools/tests/format-php-2
index 83c46e97b..9ff7342ae 100755
--- a/gettext-tools/tests/format-php-2
+++ b/gettext-tools/tests/format-php-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of PHP format strings.
 
diff --git a/gettext-tools/tests/format-python-1 b/gettext-tools/tests/format-python-1
index 27236973b..7b87cdac3 100755
--- a/gettext-tools/tests/format-python-1
+++ b/gettext-tools/tests/format-python-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Python format strings.
 
diff --git a/gettext-tools/tests/format-python-2 b/gettext-tools/tests/format-python-2
index 3d9d2080b..8b5558e32 100755
--- a/gettext-tools/tests/format-python-2
+++ b/gettext-tools/tests/format-python-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Python format strings.
 
diff --git a/gettext-tools/tests/format-python-brace-1 b/gettext-tools/tests/format-python-brace-1
index 1c4f46843..057114b2b 100755
--- a/gettext-tools/tests/format-python-brace-1
+++ b/gettext-tools/tests/format-python-brace-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Python brace format strings.
 
diff --git a/gettext-tools/tests/format-python-brace-2 b/gettext-tools/tests/format-python-brace-2
index 9f8f8beb1..a40b0529d 100755
--- a/gettext-tools/tests/format-python-brace-2
+++ b/gettext-tools/tests/format-python-brace-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Python brace format strings.
 
diff --git a/gettext-tools/tests/format-qt-1 b/gettext-tools/tests/format-qt-1
index e2207bc32..fe4e04dc6 100755
--- a/gettext-tools/tests/format-qt-1
+++ b/gettext-tools/tests/format-qt-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Qt format strings.
 
diff --git a/gettext-tools/tests/format-qt-2 b/gettext-tools/tests/format-qt-2
index 0f8005e2c..bd720c791 100755
--- a/gettext-tools/tests/format-qt-2
+++ b/gettext-tools/tests/format-qt-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Qt format strings.
 
diff --git a/gettext-tools/tests/format-qt-plural-1 b/gettext-tools/tests/format-qt-plural-1
index 6f91d85f6..4393ba61d 100755
--- a/gettext-tools/tests/format-qt-plural-1
+++ b/gettext-tools/tests/format-qt-plural-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Qt plural format strings.
 
diff --git a/gettext-tools/tests/format-qt-plural-2 b/gettext-tools/tests/format-qt-plural-2
index 2fed07b0d..48d61c15c 100755
--- a/gettext-tools/tests/format-qt-plural-2
+++ b/gettext-tools/tests/format-qt-plural-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Qt plural format strings.
 
diff --git a/gettext-tools/tests/format-scheme-1 b/gettext-tools/tests/format-scheme-1
index 753ddf0ee..741cd75b2 100755
--- a/gettext-tools/tests/format-scheme-1
+++ b/gettext-tools/tests/format-scheme-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Scheme format strings.
 
diff --git a/gettext-tools/tests/format-scheme-2 b/gettext-tools/tests/format-scheme-2
index 0be970f27..43f01fc16 100755
--- a/gettext-tools/tests/format-scheme-2
+++ b/gettext-tools/tests/format-scheme-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Lisp format strings.
 
diff --git a/gettext-tools/tests/format-sh-1 b/gettext-tools/tests/format-sh-1
index 6bbb32f95..6a8f565cb 100755
--- a/gettext-tools/tests/format-sh-1
+++ b/gettext-tools/tests/format-sh-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Shell format strings.
 
diff --git a/gettext-tools/tests/format-sh-2 b/gettext-tools/tests/format-sh-2
index cf8bbf0f7..453b19c2b 100755
--- a/gettext-tools/tests/format-sh-2
+++ b/gettext-tools/tests/format-sh-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Shell format strings.
 
diff --git a/gettext-tools/tests/format-tcl-1 b/gettext-tools/tests/format-tcl-1
index 02e0cd282..f5d0fab3d 100755
--- a/gettext-tools/tests/format-tcl-1
+++ b/gettext-tools/tests/format-tcl-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of Tcl format strings.
 
diff --git a/gettext-tools/tests/format-tcl-2 b/gettext-tools/tests/format-tcl-2
index fa8d09ac0..a76b21577 100755
--- a/gettext-tools/tests/format-tcl-2
+++ b/gettext-tools/tests/format-tcl-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of Tcl format strings.
 
diff --git a/gettext-tools/tests/format-ycp-1 b/gettext-tools/tests/format-ycp-1
index 8cd994122..9f66e8484 100755
--- a/gettext-tools/tests/format-ycp-1
+++ b/gettext-tools/tests/format-ycp-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of YCP format strings.
 
diff --git a/gettext-tools/tests/format-ycp-2 b/gettext-tools/tests/format-ycp-2
index dd6159e38..4b3bd81fd 100755
--- a/gettext-tools/tests/format-ycp-2
+++ b/gettext-tools/tests/format-ycp-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test checking of YCP format strings.
 
diff --git a/gettext-tools/tests/gettext-1 b/gettext-tools/tests/gettext-1
index 450a77243..acc8feea9 100755
--- a/gettext-tools/tests/gettext-1
+++ b/gettext-tools/tests/gettext-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test the gettext program with -e option.
 
@@ -9,7 +10,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 tmpfiles="$tmpfiles gt-1"
 test -d gt-1 || mkdir gt-1
 test -d gt-1/LC_MESSAGES || mkdir gt-1/LC_MESSAGES
-cp $top_srcdir/tests/test.mo gt-1/LC_MESSAGES
+cp ../$srcdir/test.mo gt-1/LC_MESSAGES
 
 tmpfiles="$tmpfiles gt-test1.out"
 : ${GETTEXT=gettext}
diff --git a/gettext-tools/tests/gettext-2 b/gettext-tools/tests/gettext-2
index 62692823f..387816dab 100755
--- a/gettext-tools/tests/gettext-2
+++ b/gettext-tools/tests/gettext-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test the gettext program without -e option.
 
@@ -21,7 +22,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 tmpfiles="$tmpfiles gt-2"
 test -d gt-2 || mkdir gt-2
 test -d gt-2/LC_MESSAGES || mkdir gt-2/LC_MESSAGES
-cp $top_srcdir/tests/test.mo gt-2/LC_MESSAGES
+cp ../$srcdir/test.mo gt-2/LC_MESSAGES
 
 tmpfiles="$tmpfiles gt-test2.out"
 : ${GETTEXT=gettext}
diff --git a/gettext-tools/tests/gettext-3 b/gettext-tools/tests/gettext-3
index 49a0fbcf4..974afd5a9 100755
--- a/gettext-tools/tests/gettext-3
+++ b/gettext-tools/tests/gettext-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that on glibc systems, gettext() works right even with intermediate
 # setlocale() calls.
@@ -14,7 +15,7 @@ test "$GLIBC2" = yes || {
 }
 
 # This test works only on systems that have a de_DE and fr_FR locale installed.
-LC_ALL=de_DE ./testlocale || {
+LC_ALL=de_DE ../testlocale || {
   if test -f /usr/bin/localedef; then
     echo "Skipping test: locale de_DE not installed"
   else
@@ -22,7 +23,7 @@ LC_ALL=de_DE ./testlocale || {
   fi
   exit 77
 }
-LC_ALL=fr_FR ./testlocale || {
+LC_ALL=fr_FR ../testlocale || {
   if test -f /usr/bin/localedef; then
     echo "Skipping test: locale fr_FR not installed"
   else
@@ -39,8 +40,8 @@ test -d gt-3/fr_FR || mkdir gt-3/fr_FR
 test -d gt-3/fr_FR/LC_MESSAGES || mkdir gt-3/fr_FR/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o gt-3/de_DE/LC_MESSAGES/tstlang.mo ${top_srcdir}/tests/gettext-3-1.po
-${MSGFMT} -o gt-3/fr_FR/LC_MESSAGES/tstlang.mo ${top_srcdir}/tests/gettext-3-2.po
+${MSGFMT} -o gt-3/de_DE/LC_MESSAGES/tstlang.mo ../${srcdir}/gettext-3-1.po
+${MSGFMT} -o gt-3/fr_FR/LC_MESSAGES/tstlang.mo ../${srcdir}/gettext-3-2.po
 
 tmpfiles="$tmpfiles gt-3.ok"
 cat <<EOF > gt-3.ok
@@ -53,7 +54,7 @@ String2 - Another string for testing.
 EOF
 
 tmpfiles="$tmpfiles gt-3.out"
-./gettext-3-prg > gt-3.out || exit 1
+../gettext-3-prg > gt-3.out || exit 1
 
 : ${DIFF=diff}
 ${DIFF} gt-3.ok gt-3.out || exit 1
diff --git a/gettext-tools/tests/gettext-4 b/gettext-tools/tests/gettext-4
index fb404e33d..5573e5fff 100755
--- a/gettext-tools/tests/gettext-4
+++ b/gettext-tools/tests/gettext-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that bind_textdomain_codeset() works.
 
@@ -12,7 +13,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 # a traditional french locale is installed; no need to check also for a
 # traditional german locale.
 : ${LOCALE_FR=fr_FR}
-{ test $LOCALE_FR != none && LC_ALL=$LOCALE_FR ./testlocale; } || {
+{ test $LOCALE_FR != none && LC_ALL=$LOCALE_FR ../testlocale; } || {
   if test -f /usr/bin/localedef; then
     echo "Skipping test: no traditional french locale is installed"
   else
@@ -27,9 +28,9 @@ test -d gt-4/fr || mkdir gt-4/fr
 test -d gt-4/fr/LC_MESSAGES || mkdir gt-4/fr/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o gt-4/fr/LC_MESSAGES/codeset.mo ${top_srcdir}/tests/gettext-4.po
+${MSGFMT} -o gt-4/fr/LC_MESSAGES/codeset.mo ../${srcdir}/gettext-4.po
 
-./gettext-4-prg $LOCALE_FR || exit 1
+../gettext-4-prg $LOCALE_FR || exit 1
 
 rm -fr $tmpfiles
 
diff --git a/gettext-tools/tests/gettext-5 b/gettext-tools/tests/gettext-5
index bb76a5d33..747a98cd6 100755
--- a/gettext-tools/tests/gettext-5
+++ b/gettext-tools/tests/gettext-5
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that on glibc systems, the gettext() results come out in the correct
 # encoding for locales that differ only in their encoding.
@@ -15,7 +16,7 @@ test "$GLIBC2" = yes || {
 
 # This test works only on systems that have a de_DE.ISO-8859-1 and
 # de_DE.UTF-8 locale installed.
-LC_ALL=de_DE.ISO-8859-1 ./testlocale || {
+LC_ALL=de_DE.ISO-8859-1 ../testlocale || {
   if test -f /usr/bin/localedef; then
     echo "Skipping test: locale de_DE.ISO-8859-1 not installed"
   else
@@ -23,7 +24,7 @@ LC_ALL=de_DE.ISO-8859-1 ./testlocale || {
   fi
   exit 77
 }
-LC_ALL=de_DE.UTF-8 ./testlocale || {
+LC_ALL=de_DE.UTF-8 ../testlocale || {
   if test -f /usr/bin/localedef; then
     echo "Skipping test: locale de_DE.UTF-8 not installed"
   else
@@ -38,9 +39,9 @@ test -d gt-5/de_DE || mkdir gt-5/de_DE
 test -d gt-5/de_DE/LC_MESSAGES || mkdir gt-5/de_DE/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o gt-5/de_DE/LC_MESSAGES/codeset.mo ${top_srcdir}/tests/gettext-5.po
+${MSGFMT} -o gt-5/de_DE/LC_MESSAGES/codeset.mo ../${srcdir}/gettext-5.po
 
-./gettext-5-prg || exit 1
+../gettext-5-prg || exit 1
 
 rm -fr $tmpfiles
 
diff --git a/gettext-tools/tests/gettext-6 b/gettext-tools/tests/gettext-6
index 3ec042373..331d3203b 100755
--- a/gettext-tools/tests/gettext-6
+++ b/gettext-tools/tests/gettext-6
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that on glibc systems, gettext() in multithreaded applications works
 # correctly if different threads operate in different locales with the same
@@ -39,8 +40,8 @@ test -d gt-6/fr_FR || mkdir gt-6/fr_FR
 test -d gt-6/fr_FR/LC_MESSAGES || mkdir gt-6/fr_FR/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o gt-6/de_DE/LC_MESSAGES/tstthread.mo ${top_srcdir}/tests/gettext-6-1.po
-${MSGFMT} -o gt-6/fr_FR/LC_MESSAGES/tstthread.mo ${top_srcdir}/tests/gettext-6-2.po
+${MSGFMT} -o gt-6/de_DE/LC_MESSAGES/tstthread.mo ../${srcdir}/gettext-6-1.po
+${MSGFMT} -o gt-6/fr_FR/LC_MESSAGES/tstthread.mo ../${srcdir}/gettext-6-2.po
 
 tmpfiles="$tmpfiles gt-6.ok"
 cat <<EOF > gt-6.ok
@@ -51,7 +52,7 @@ beaut
 EOF
 
 tmpfiles="$tmpfiles gt-6.out"
-./gettext-6-prg > gt-6.out
+../gettext-6-prg > gt-6.out
 case $? in
   0) ;;
   77)
diff --git a/gettext-tools/tests/gettext-7 b/gettext-tools/tests/gettext-7
index 09123cd61..0970df491 100755
--- a/gettext-tools/tests/gettext-7
+++ b/gettext-tools/tests/gettext-7
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that on glibc systems, gettext() in multithreaded applications works
 # correctly if different threads operate in different locales referring to
@@ -38,10 +39,10 @@ test -d gt-7/de_DE || mkdir gt-7/de_DE
 test -d gt-7/de_DE/LC_MESSAGES || mkdir gt-7/de_DE/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o gt-7/de_DE/LC_MESSAGES/tstthread.mo ${top_srcdir}/tests/gettext-7.po
+${MSGFMT} -o gt-7/de_DE/LC_MESSAGES/tstthread.mo ../${srcdir}/gettext-7.po
 
 tmpfiles="$tmpfiles gt-7.out"
-./gettext-7-prg > gt-7.out
+../gettext-7-prg > gt-7.out
 case $? in
   0) ;;
   77)
diff --git a/gettext-tools/tests/gettext-8 b/gettext-tools/tests/gettext-8
index 114922df3..5ee22bcab 100755
--- a/gettext-tools/tests/gettext-8
+++ b/gettext-tools/tests/gettext-8
@@ -1,5 +1,6 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that gettext() does not crash by stack overflow when msgid is very long.
 
-./gettext-8-prg
+../gettext-8-prg
diff --git a/gettext-tools/tests/gettextpo-1 b/gettext-tools/tests/gettextpo-1
index b1b277d5d..e40a7eb99 100755
--- a/gettext-tools/tests/gettextpo-1
+++ b/gettext-tools/tests/gettextpo-1
@@ -1,14 +1,15 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test the libgettextpo library.
 tmpfiles="gtpo-1-copied.po gtpo-1-created.po"
-./gettextpo-1-prg${EXEEXT} ${srcdir}/gettextpo-1.de.po > /dev/null
+../gettextpo-1-prg${EXEEXT} ../${srcdir}/gettextpo-1.de.po > /dev/null
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
-${DIFF} ${srcdir}/gettextpo-1.de.po gtpo-1-copied.po
+${DIFF} ../${srcdir}/gettextpo-1.de.po gtpo-1-copied.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-${DIFF} ${srcdir}/gettextpo-1.de.po gtpo-1-created.po
+${DIFF} ../${srcdir}/gettextpo-1.de.po gtpo-1-created.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 rm -f $tmpfiles
diff --git a/gettext-tools/tests/lang-bash b/gettext-tools/tests/lang-bash
index 3510f19bb..01be04517 100755
--- a/gettext-tools/tests/lang-bash
+++ b/gettext-tools/tests/lang-bash
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the bash language.
 # Assumes an fr_FR locale is installed.
@@ -104,7 +105,7 @@ esac
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ./testlocale
+  LC_ALL=$LOCALE_FR ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -112,7 +113,7 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
diff --git a/gettext-tools/tests/lang-c b/gettext-tools/tests/lang-c
index 43fb57f56..b2ce58bf8 100755
--- a/gettext-tools/tests/lang-c
+++ b/gettext-tools/tests/lang-c
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the C language.
 # Assumes an fr_FR locale is installed.
@@ -43,13 +44,14 @@ int main (int argc, char *argv[])
 EOF
 
 # Variable needed by LTLIBINTL.
-top_builddir=..
+top_builddir=../..
 
 tmpfiles="$tmpfiles l-c-prog.${OBJEXT} l-c-prog${EXEEXT}"
 # Put the -I flags before ${CFLAGS} ${CPPFLAGS}, to make sure that libintl.h
 # is found in the build directory, regardless of -I options present in
 # ${CFLAGS} or ${CPPFLAGS}.
-${LIBTOOL} --quiet --mode=link ${CC} -I.. -I$top_srcdir/gnulib-lib ../gnulib-lib/libgettextlib.la -I../intl ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o l-c-prog prog.c ${LTLIBINTL} \
+: ${LIBTOOL=/bin/sh ../../libtool}
+${LIBTOOL} --quiet --mode=link ${CC} -I../.. -I../$top_srcdir/gnulib-lib ../../gnulib-lib/libgettextlib.la -I../../intl ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o l-c-prog prog.c ${LTLIBINTL} \
   || exit 1
 
 tmpfiles="$tmpfiles l-c-prog.tmp l-c-prog.pot"
diff --git a/gettext-tools/tests/lang-c++ b/gettext-tools/tests/lang-c++
index a14b2235d..4cc12fb10 100755
--- a/gettext-tools/tests/lang-c++
+++ b/gettext-tools/tests/lang-c++
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the C++ language.
 # Assumes an fr_FR locale is installed.
@@ -60,7 +61,7 @@ int main (int argc, char *argv[])
 EOF
 
 # Variable needed by LTLIBINTL.
-top_builddir=..
+top_builddir=../..
 
 tmpfiles="$tmpfiles l-c++-prog.${OBJEXT} l-c++-prog${EXEEXT}"
 # Compile in two steps from .cc to .o and from .o to 'l-c++-prog'. This way,
@@ -68,12 +69,13 @@ tmpfiles="$tmpfiles l-c++-prog.${OBJEXT} l-c++-prog${EXEEXT}"
 # Put the -I flags before ${CXXFLAGS} ${CPPFLAGS}, to make sure that libintl.h
 # is found in the build directory, regardless of -I options present in
 # ${CXXFLAGS} or ${CPPFLAGS}.
-${CXX} -I.. -I../../gettext-runtime/libasprintf -I$top_srcdir/gnulib-lib -I../intl ${CXXFLAGS} ${CPPFLAGS} -c l-c++-prog.cc \
+${CXX} -I../.. -I../../../gettext-runtime/libasprintf -I../$top_srcdir/gnulib-lib -I../../intl ${CXXFLAGS} ${CPPFLAGS} -c l-c++-prog.cc \
   || exit 1
 # Remove the -Wl,--disable-auto-import option here that is added by
 # woe32-dll.m4. Cygwin 1.7.2 does not support it in C++ mode: It gives
 # a link error about 'std::cout'.
-${LIBTOOL} --quiet --mode=link --tag=CXX ${CXX} ${CXXFLAGS} `echo "X ${LDFLAGS} " | sed -e 's/^X//' -e 's/ -Wl,--disable-auto-import / /'` -o l-c++-prog l-c++-prog.${OBJEXT} ../../gettext-runtime/libasprintf/libasprintf.la ../gnulib-lib/libgettextlib.la ${LTLIBINTL} \
+: ${LIBTOOL=/bin/sh ../../libtool}
+${LIBTOOL} --quiet --mode=link --tag=CXX ${CXX} ${CXXFLAGS} `echo "X ${LDFLAGS} " | sed -e 's/^X//' -e 's/ -Wl,--disable-auto-import / /'` -o l-c++-prog l-c++-prog.${OBJEXT} ../../../gettext-runtime/libasprintf/libasprintf.la ../../gnulib-lib/libgettextlib.la ${LTLIBINTL} \
   || exit 1
 
 tmpfiles="$tmpfiles l-c++-prog.tmp l-c++-prog.pot"
diff --git a/gettext-tools/tests/lang-clisp b/gettext-tools/tests/lang-clisp
index ace3ed53f..78ee8ee1f 100755
--- a/gettext-tools/tests/lang-clisp
+++ b/gettext-tools/tests/lang-clisp
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the CLISP language.
 # Assumes an fr_FR locale is installed.
@@ -109,7 +110,7 @@ clisp -norc -x "(sys::exit #+GETTEXT (not (>= $version 2.28)) #-GETTEXT t)" \
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ./testlocale
+  LC_ALL=$LOCALE_FR ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -117,7 +118,7 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
diff --git a/gettext-tools/tests/lang-csharp b/gettext-tools/tests/lang-csharp
index 0092953a2..0d638984b 100755
--- a/gettext-tools/tests/lang-csharp
+++ b/gettext-tools/tests/lang-csharp
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the C# language.
 # Assumes an fr_FR locale is installed.
@@ -51,8 +52,8 @@ EOF
 
 tmpfiles="$tmpfiles l-csharp"
 test -d l-csharp || mkdir l-csharp
-: ${CSHARPCOMP="/bin/sh ../csharpcomp.sh"}
-${CSHARPCOMP} -o l-csharp/program.exe -L ../../gettext-runtime/intl-csharp -l GNU.Gettext program.cs || exit 1
+: ${CSHARPCOMP="/bin/sh ../../csharpcomp.sh"}
+${CSHARPCOMP} -o l-csharp/program.exe -L ../../../gettext-runtime/intl-csharp -l GNU.Gettext program.cs || exit 1
 
 tmpfiles="$tmpfiles l-csharp-prog.tmp l-csharp-prog.pot"
 : ${XGETTEXT=xgettext}
@@ -140,7 +141,7 @@ test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 ${DIFF} l-csharp-fr.po l-csharp-fr.po.new || exit 1
 
 : ${MSGFMT=msgfmt}
-GETTEXTCSHARPLIBDIR=../../gettext-runtime/intl-csharp \
+GETTEXTCSHARPLIBDIR=../../../gettext-runtime/intl-csharp \
 ${MSGFMT} --csharp -d l-csharp -r prog -l fr l-csharp-fr.po || exit 1
 exit 0
 
@@ -148,7 +149,7 @@ exit 0
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ./testlocale
+  LC_ALL=$LOCALE_FR ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -156,7 +157,7 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
@@ -191,13 +192,13 @@ EOF
 
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
-: ${CSHARPEXEC="/bin/sh ../csharpexec.sh"}
+: ${CSHARPEXEC="/bin/sh ../../csharpexec.sh"}
 if test $LOCALE_FR != none; then
-  LANGUAGE= LC_ALL=$LOCALE_FR ${CSHARPEXEC} -L ../../gettext-runtime/intl-csharp l-csharp/program.exe 2 > l-csharp-prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR ${CSHARPEXEC} -L ../../../gettext-runtime/intl-csharp l-csharp/program.exe 2 > l-csharp-prog.out || exit 1
   ${DIFF} l-csharp-prog.ok l-csharp-prog.out || exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 ${CSHARPEXEC} -L ../../gettext-runtime/intl-csharp l-csharp/program.exe 2 > l-csharp-prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 ${CSHARPEXEC} -L ../../../gettext-runtime/intl-csharp l-csharp/program.exe 2 > l-csharp-prog.out || exit 1
   ${DIFF} l-csharp-prog.oku l-csharp-prog.out || exit 1
 fi
 
diff --git a/gettext-tools/tests/lang-elisp b/gettext-tools/tests/lang-elisp
index 86a930f53..7a49ae549 100755
--- a/gettext-tools/tests/lang-elisp
+++ b/gettext-tools/tests/lang-elisp
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Emacs Lisp language.
 
diff --git a/gettext-tools/tests/lang-gawk b/gettext-tools/tests/lang-gawk
index ebf73c471..dca67efc3 100755
--- a/gettext-tools/tests/lang-gawk
+++ b/gettext-tools/tests/lang-gawk
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the GNU awk language.
 # Assumes an fr_FR locale is installed.
@@ -104,7 +105,7 @@ esac
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ./testlocale
+  LC_ALL=$LOCALE_FR ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -112,7 +113,7 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
diff --git a/gettext-tools/tests/lang-guile b/gettext-tools/tests/lang-guile
index 0f8795d79..13cb07cdb 100755
--- a/gettext-tools/tests/lang-guile
+++ b/gettext-tools/tests/lang-guile
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the guile implementation of Scheme.
 # Assumes an fr_FR locale is installed.
@@ -103,7 +104,7 @@ esac
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ./testlocale
+  LC_ALL=$LOCALE_FR ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -111,7 +112,7 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
diff --git a/gettext-tools/tests/lang-java b/gettext-tools/tests/lang-java
index ae9e7b0ee..6e7d194a9 100755
--- a/gettext-tools/tests/lang-java
+++ b/gettext-tools/tests/lang-java
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Java language.
 # Assumes an fr_FR locale is installed.
@@ -65,8 +66,8 @@ EOF
 tmpfiles="$tmpfiles Program.class l-java l-java-prog.err"
 test -d l-java || mkdir l-java
 
-: ${JAVACOMP="/bin/sh ../javacomp.sh"}
-CLASSPATH=../../gettext-runtime/intl-java/libintl.jar ${JAVACOMP} -d l-java Program.java 2>l-java-prog.err \
+: ${JAVACOMP="/bin/sh ../../javacomp.sh"}
+CLASSPATH=../../../gettext-runtime/intl-java/libintl.jar ${JAVACOMP} -d l-java Program.java 2>l-java-prog.err \
   || { cat l-java-prog.err 1>&2; exit 1; }
 
 tmpfiles="$tmpfiles l-java-prog.tmp l-java-prog.pot"
@@ -162,7 +163,7 @@ ${MSGFMT} -j -d l-java -r prog -l fr l-java-fr.po || exit 1
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ./testlocale
+  LC_ALL=$LOCALE_FR ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -170,7 +171,7 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
@@ -205,13 +206,13 @@ EOF
 
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
-: ${JAVAEXEC="/bin/sh ../javaexec.sh"}
+: ${JAVAEXEC="/bin/sh ../../javaexec.sh"}
 if test $LOCALE_FR != none; then
-  LANGUAGE= LC_ALL=$LOCALE_FR CLASSPATH=l-java:../../gettext-runtime/intl-java/libintl.jar ${JAVAEXEC} Program 2 ISO-8859-1 > l-java-prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR CLASSPATH=l-java:../../../gettext-runtime/intl-java/libintl.jar ${JAVAEXEC} Program 2 ISO-8859-1 > l-java-prog.out || exit 1
   ${DIFF} l-java-prog.ok l-java-prog.out || exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 CLASSPATH=l-java:../../gettext-runtime/intl-java/libintl.jar ${JAVAEXEC} Program 2 UTF-8 > l-java-prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 CLASSPATH=l-java:../../../gettext-runtime/intl-java/libintl.jar ${JAVAEXEC} Program 2 UTF-8 > l-java-prog.out || exit 1
   ${DIFF} l-java-prog.oku l-java-prog.out || exit 1
 fi
 
diff --git a/gettext-tools/tests/lang-javascript b/gettext-tools/tests/lang-javascript
index 47abb84fe..c53cdf332 100755
--- a/gettext-tools/tests/lang-javascript
+++ b/gettext-tools/tests/lang-javascript
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the JavaScript language.
 # Assumes an fr_FR locale is installed.
@@ -85,7 +86,7 @@ ${MSGFMT} -o l-javascript/fr/LC_MESSAGES/prog.mo l-javascript-fr.po
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ./testlocale
+  LC_ALL=$LOCALE_FR ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -93,7 +94,7 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
diff --git a/gettext-tools/tests/lang-librep b/gettext-tools/tests/lang-librep
index a03c5e167..89743a0c4 100755
--- a/gettext-tools/tests/lang-librep
+++ b/gettext-tools/tests/lang-librep
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the librep language.
 # Assumes an fr_FR locale is installed.
@@ -86,7 +87,7 @@ esac
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ./testlocale
+  LC_ALL=$LOCALE_FR ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -94,7 +95,7 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
diff --git a/gettext-tools/tests/lang-lua b/gettext-tools/tests/lang-lua
index 006482470..3fbe068f9 100755
--- a/gettext-tools/tests/lang-lua
+++ b/gettext-tools/tests/lang-lua
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Lua language.
 # Assumes an fr_FR locale is installed.
@@ -102,7 +103,7 @@ esac
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ./testlocale
+  LC_ALL=$LOCALE_FR ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -110,7 +111,7 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
diff --git a/gettext-tools/tests/lang-objc b/gettext-tools/tests/lang-objc
index 4c73225c7..cc04b4877 100755
--- a/gettext-tools/tests/lang-objc
+++ b/gettext-tools/tests/lang-objc
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Objective C language.
 # Assumes an fr_FR locale is installed.
@@ -59,13 +60,14 @@ int main (int argc, char *argv[])
 EOF
 
 # Variable needed by LTLIBINTL.
-top_builddir=..
+top_builddir=../..
 
 tmpfiles="$tmpfiles l-objc-prog.${OBJEXT} l-objc-prog${EXEEXT}"
 # Put the -I flags before ${CFLAGS} ${CPPFLAGS}, to make sure that libintl.h
 # is found in the build directory, regardless of -I options present in
 # ${CFLAGS} or ${CPPFLAGS}.
-${LIBTOOL} --quiet --mode=link ${CC} -I.. -I$top_srcdir/gnulib-lib ../gnulib-lib/libgettextlib.la -I../intl ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o l-objc-prog prog.m ${LTLIBINTL} \
+: ${LIBTOOL=/bin/sh ../../libtool}
+${LIBTOOL} --quiet --mode=link ${CC} -I../.. -I../$top_srcdir/gnulib-lib ../../gnulib-lib/libgettextlib.la -I../../intl ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o l-objc-prog prog.m ${LTLIBINTL} \
   || exit 1
 
 tmpfiles="$tmpfiles l-objc-prog.tmp l-objc-prog.pot"
diff --git a/gettext-tools/tests/lang-pascal b/gettext-tools/tests/lang-pascal
index 2b879fe32..403293766 100755
--- a/gettext-tools/tests/lang-pascal
+++ b/gettext-tools/tests/lang-pascal
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Object Pascal language.
 # Assumes the following packages are installed: fpk.
diff --git a/gettext-tools/tests/lang-perl-1 b/gettext-tools/tests/lang-perl-1
index 91ede8abd..acea7b638 100755
--- a/gettext-tools/tests/lang-perl-1
+++ b/gettext-tools/tests/lang-perl-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Perl language,
 # using printf format strings.
diff --git a/gettext-tools/tests/lang-perl-2 b/gettext-tools/tests/lang-perl-2
index 2e7b911bf..4a1578c31 100755
--- a/gettext-tools/tests/lang-perl-2
+++ b/gettext-tools/tests/lang-perl-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Perl language,
 # using brace format strings.
diff --git a/gettext-tools/tests/lang-php b/gettext-tools/tests/lang-php
index d745b7d03..072392cac 100755
--- a/gettext-tools/tests/lang-php
+++ b/gettext-tools/tests/lang-php
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the PHP language.
 # Assumes an fr_FR locale is installed.
@@ -89,7 +90,7 @@ esac
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ./testlocale
+  LC_ALL=$LOCALE_FR ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -97,7 +98,7 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
diff --git a/gettext-tools/tests/lang-po b/gettext-tools/tests/lang-po
index 772914b13..c37da7e19 100755
--- a/gettext-tools/tests/lang-po
+++ b/gettext-tools/tests/lang-po
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the PO/POT format.
 
diff --git a/gettext-tools/tests/lang-python-1 b/gettext-tools/tests/lang-python-1
index 141115d6c..6dff69c4b 100755
--- a/gettext-tools/tests/lang-python-1
+++ b/gettext-tools/tests/lang-python-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Python language.
 
diff --git a/gettext-tools/tests/lang-python-2 b/gettext-tools/tests/lang-python-2
index 3a2fa8fbe..770babe9b 100755
--- a/gettext-tools/tests/lang-python-2
+++ b/gettext-tools/tests/lang-python-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities (including plural handling) in the Python
 # language.
diff --git a/gettext-tools/tests/lang-rst b/gettext-tools/tests/lang-rst
index 36b076848..baee2db8a 100755
--- a/gettext-tools/tests/lang-rst
+++ b/gettext-tools/tests/lang-rst
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the RST format.
 
diff --git a/gettext-tools/tests/lang-sh b/gettext-tools/tests/lang-sh
index 8d18556bc..794d8b34a 100755
--- a/gettext-tools/tests/lang-sh
+++ b/gettext-tools/tests/lang-sh
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the sh language.
 # Assumes an fr_FR locale is installed.
@@ -90,7 +91,7 @@ ${MSGFMT} -o l-sh/fr/LC_MESSAGES/prog.mo l-sh-fr.po
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ./testlocale
+  LC_ALL=$LOCALE_FR ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -98,7 +99,7 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
diff --git a/gettext-tools/tests/lang-smalltalk b/gettext-tools/tests/lang-smalltalk
index 596ad1755..448badf70 100755
--- a/gettext-tools/tests/lang-smalltalk
+++ b/gettext-tools/tests/lang-smalltalk
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the GNU smalltalk language.
 # Assumes an fr_FR locale is installed.
diff --git a/gettext-tools/tests/lang-tcl b/gettext-tools/tests/lang-tcl
index 240572046..4f8416dfc 100755
--- a/gettext-tools/tests/lang-tcl
+++ b/gettext-tools/tests/lang-tcl
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Tcl language.
 # Assumes an fr_FR locale is installed.
diff --git a/gettext-tools/tests/lang-vala b/gettext-tools/tests/lang-vala
index 2a5950dca..096fd3e3d 100644
--- a/gettext-tools/tests/lang-vala
+++ b/gettext-tools/tests/lang-vala
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Vala language.
 # Assumes an fr_FR locale is installed.
diff --git a/gettext-tools/tests/lang-ycp b/gettext-tools/tests/lang-ycp
index 4ae5e46ec..01b9b3aaa 100755
--- a/gettext-tools/tests/lang-ycp
+++ b/gettext-tools/tests/lang-ycp
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the YCP language.
 
diff --git a/gettext-tools/tests/msgattrib-1 b/gettext-tools/tests/msgattrib-1
index 5fec17beb..02ece63b5 100755
--- a/gettext-tools/tests/msgattrib-1
+++ b/gettext-tools/tests/msgattrib-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --translated option.
 
diff --git a/gettext-tools/tests/msgattrib-10 b/gettext-tools/tests/msgattrib-10
index 3408f37ff..b639ae151 100755
--- a/gettext-tools/tests/msgattrib-10
+++ b/gettext-tools/tests/msgattrib-10
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --set-obsolete option. Note that the output routines drop untranslated
 # obsolete messages.
diff --git a/gettext-tools/tests/msgattrib-11 b/gettext-tools/tests/msgattrib-11
index a4c3a22c7..918430920 100755
--- a/gettext-tools/tests/msgattrib-11
+++ b/gettext-tools/tests/msgattrib-11
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --clear-obsolete option.
 
diff --git a/gettext-tools/tests/msgattrib-12 b/gettext-tools/tests/msgattrib-12
index 681c468f5..a056b29e9 100755
--- a/gettext-tools/tests/msgattrib-12
+++ b/gettext-tools/tests/msgattrib-12
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --fuzzy option.
 
diff --git a/gettext-tools/tests/msgattrib-13 b/gettext-tools/tests/msgattrib-13
index ec362a9d8..90d68c67d 100755
--- a/gettext-tools/tests/msgattrib-13
+++ b/gettext-tools/tests/msgattrib-13
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --obsolete option.
 
diff --git a/gettext-tools/tests/msgattrib-14 b/gettext-tools/tests/msgattrib-14
index 0de21ba0e..507f83dd0 100755
--- a/gettext-tools/tests/msgattrib-14
+++ b/gettext-tools/tests/msgattrib-14
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test combination of selection and manipulation option.
 
diff --git a/gettext-tools/tests/msgattrib-15 b/gettext-tools/tests/msgattrib-15
index d65fc4e03..5ddf085ed 100755
--- a/gettext-tools/tests/msgattrib-15
+++ b/gettext-tools/tests/msgattrib-15
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgattrib on a PO file with contexts.
 
diff --git a/gettext-tools/tests/msgattrib-16 b/gettext-tools/tests/msgattrib-16
index ff8dfdc36..f88b545a6 100755
--- a/gettext-tools/tests/msgattrib-16
+++ b/gettext-tools/tests/msgattrib-16
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgattrib on a PO file with previous msgids.
 
diff --git a/gettext-tools/tests/msgattrib-17 b/gettext-tools/tests/msgattrib-17
index 0409c3a9f..22835dcb6 100755
--- a/gettext-tools/tests/msgattrib-17
+++ b/gettext-tools/tests/msgattrib-17
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgattrib option --clear-previous.
 
diff --git a/gettext-tools/tests/msgattrib-2 b/gettext-tools/tests/msgattrib-2
index aaced02ab..adfcb4ea1 100755
--- a/gettext-tools/tests/msgattrib-2
+++ b/gettext-tools/tests/msgattrib-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --untranslated option.
 
diff --git a/gettext-tools/tests/msgattrib-3 b/gettext-tools/tests/msgattrib-3
index 2d6ca7f2e..50bf75068 100755
--- a/gettext-tools/tests/msgattrib-3
+++ b/gettext-tools/tests/msgattrib-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --no-fuzzy option.
 
diff --git a/gettext-tools/tests/msgattrib-4 b/gettext-tools/tests/msgattrib-4
index 641d5a6e5..bf0b47606 100755
--- a/gettext-tools/tests/msgattrib-4
+++ b/gettext-tools/tests/msgattrib-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --only-fuzzy option.
 
diff --git a/gettext-tools/tests/msgattrib-5 b/gettext-tools/tests/msgattrib-5
index f8728664a..f6953a9d7 100755
--- a/gettext-tools/tests/msgattrib-5
+++ b/gettext-tools/tests/msgattrib-5
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --no-obsolete option.
 
diff --git a/gettext-tools/tests/msgattrib-6 b/gettext-tools/tests/msgattrib-6
index 08f41f6c3..411e6958f 100755
--- a/gettext-tools/tests/msgattrib-6
+++ b/gettext-tools/tests/msgattrib-6
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --only-obsolete option.
 
diff --git a/gettext-tools/tests/msgattrib-7 b/gettext-tools/tests/msgattrib-7
index e0c3ce33b..8aeed0f12 100755
--- a/gettext-tools/tests/msgattrib-7
+++ b/gettext-tools/tests/msgattrib-7
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test combination of two selection options.
 
diff --git a/gettext-tools/tests/msgattrib-8 b/gettext-tools/tests/msgattrib-8
index 83a0ca71a..d3e356bad 100755
--- a/gettext-tools/tests/msgattrib-8
+++ b/gettext-tools/tests/msgattrib-8
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --set-fuzzy option. Note that the output routines ignore the fuzzy
 # attribute for untranslated messages.
diff --git a/gettext-tools/tests/msgattrib-9 b/gettext-tools/tests/msgattrib-9
index 909bad3ef..8920b2a72 100755
--- a/gettext-tools/tests/msgattrib-9
+++ b/gettext-tools/tests/msgattrib-9
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --clear-fuzzy option.
 
diff --git a/gettext-tools/tests/msgattrib-properties-1 b/gettext-tools/tests/msgattrib-properties-1
index fc422004d..2286b619d 100755
--- a/gettext-tools/tests/msgattrib-properties-1
+++ b/gettext-tools/tests/msgattrib-properties-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --translated option with Java .properties syntax.
 
diff --git a/gettext-tools/tests/msgcat-1 b/gettext-tools/tests/msgcat-1
index 0a0da986d..b4ab0675c 100755
--- a/gettext-tools/tests/msgcat-1
+++ b/gettext-tools/tests/msgcat-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify that msgcat doesn't introduce alternative syntax if all translations
 # have the same msgstr.
diff --git a/gettext-tools/tests/msgcat-10 b/gettext-tools/tests/msgcat-10
index 4af252bf7..d501a7754 100755
--- a/gettext-tools/tests/msgcat-10
+++ b/gettext-tools/tests/msgcat-10
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify msgcat of two files, when the header entries have different comments
 # but the same contents. The resulting header entry is not marked fuzzy,
diff --git a/gettext-tools/tests/msgcat-11 b/gettext-tools/tests/msgcat-11
index f86b4dfaf..5c75430d5 100755
--- a/gettext-tools/tests/msgcat-11
+++ b/gettext-tools/tests/msgcat-11
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify that msgcat leaves #: lines in place even if they have a bizarre
 # syntax.
diff --git a/gettext-tools/tests/msgcat-12 b/gettext-tools/tests/msgcat-12
index cb0c039b1..a0677c7d9 100755
--- a/gettext-tools/tests/msgcat-12
+++ b/gettext-tools/tests/msgcat-12
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify that msgcat complains when it would need to change msgids.
 
diff --git a/gettext-tools/tests/msgcat-13 b/gettext-tools/tests/msgcat-13
index b7104c0f2..4a6616ccd 100755
--- a/gettext-tools/tests/msgcat-13
+++ b/gettext-tools/tests/msgcat-13
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgcat on PO files with contexts.
 
diff --git a/gettext-tools/tests/msgcat-14 b/gettext-tools/tests/msgcat-14
index b6865944c..d3844c766 100755
--- a/gettext-tools/tests/msgcat-14
+++ b/gettext-tools/tests/msgcat-14
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify that msgcat complains when it would need to change msgctxts.
 
diff --git a/gettext-tools/tests/msgcat-15 b/gettext-tools/tests/msgcat-15
index b89ad8d67..44f164f4f 100755
--- a/gettext-tools/tests/msgcat-15
+++ b/gettext-tools/tests/msgcat-15
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgcat on a PO file with previous msgids.
 
diff --git a/gettext-tools/tests/msgcat-16 b/gettext-tools/tests/msgcat-16
index 017b249b7..44dbaab72 100755
--- a/gettext-tools/tests/msgcat-16
+++ b/gettext-tools/tests/msgcat-16
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgcat on a PO files with previous msgids.
 
diff --git a/gettext-tools/tests/msgcat-17 b/gettext-tools/tests/msgcat-17
index 593568846..86189a672 100755
--- a/gettext-tools/tests/msgcat-17
+++ b/gettext-tools/tests/msgcat-17
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgcat with --width option. Check that format strings are not broken.
 
diff --git a/gettext-tools/tests/msgcat-18 b/gettext-tools/tests/msgcat-18
index 088069bca..af5a188dc 100755
--- a/gettext-tools/tests/msgcat-18
+++ b/gettext-tools/tests/msgcat-18
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgcat: handling of 'range:' flags.
 
diff --git a/gettext-tools/tests/msgcat-2 b/gettext-tools/tests/msgcat-2
index ec48d204b..b91c25bf4 100755
--- a/gettext-tools/tests/msgcat-2
+++ b/gettext-tools/tests/msgcat-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of input files with different charsets.
 
diff --git a/gettext-tools/tests/msgcat-3 b/gettext-tools/tests/msgcat-3
index f947d02e3..7247b02b6 100755
--- a/gettext-tools/tests/msgcat-3
+++ b/gettext-tools/tests/msgcat-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of input files with different charsets.
 # 1. ISO-8859-1, 2. UTF-8; plus --use-first
diff --git a/gettext-tools/tests/msgcat-4 b/gettext-tools/tests/msgcat-4
index 16da2db8d..9af00746b 100755
--- a/gettext-tools/tests/msgcat-4
+++ b/gettext-tools/tests/msgcat-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of input files with different charsets:
 # 1. UTF-8, 2. ISO-8859-1; plus --use-first
diff --git a/gettext-tools/tests/msgcat-5 b/gettext-tools/tests/msgcat-5
index 745c2f56d..6040eee17 100755
--- a/gettext-tools/tests/msgcat-5
+++ b/gettext-tools/tests/msgcat-5
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of input files with different translations:
 # try --use-first
diff --git a/gettext-tools/tests/msgcat-6 b/gettext-tools/tests/msgcat-6
index 16a096ec1..f5cff7ed3 100755
--- a/gettext-tools/tests/msgcat-6
+++ b/gettext-tools/tests/msgcat-6
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of input files with different translations:
 # preserve all variants, add markers
diff --git a/gettext-tools/tests/msgcat-7 b/gettext-tools/tests/msgcat-7
index 2d2b4697b..bdca902cd 100755
--- a/gettext-tools/tests/msgcat-7
+++ b/gettext-tools/tests/msgcat-7
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify 'msgcat --sort-output'
 
diff --git a/gettext-tools/tests/msgcat-8 b/gettext-tools/tests/msgcat-8
index 889440ff2..f3abdf4ec 100755
--- a/gettext-tools/tests/msgcat-8
+++ b/gettext-tools/tests/msgcat-8
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify msgcat of two files, when the header entries have different comments
 # and different contents. The resulting header entry must be marked fuzzy.
diff --git a/gettext-tools/tests/msgcat-9 b/gettext-tools/tests/msgcat-9
index 6eb2c920f..5178fb187 100755
--- a/gettext-tools/tests/msgcat-9
+++ b/gettext-tools/tests/msgcat-9
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify msgcat of two files, when the header entries have the same comments
 # but different contents. The resulting header entry must be marked fuzzy.
diff --git a/gettext-tools/tests/msgcat-properties-1 b/gettext-tools/tests/msgcat-properties-1
index 47883068a..73a16f827 100755
--- a/gettext-tools/tests/msgcat-properties-1
+++ b/gettext-tools/tests/msgcat-properties-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --use-first option with Java .properties syntax.
 
diff --git a/gettext-tools/tests/msgcat-properties-2 b/gettext-tools/tests/msgcat-properties-2
index 4570389e5..4b29ff0bb 100755
--- a/gettext-tools/tests/msgcat-properties-2
+++ b/gettext-tools/tests/msgcat-properties-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test conversion from UTF-8 to BIG5 is a NOP with Java .properties syntax.
 # Test that encoding names are case insensitive.
diff --git a/gettext-tools/tests/msgcat-stringtable-1 b/gettext-tools/tests/msgcat-stringtable-1
index ff066fe6f..a227a48b0 100755
--- a/gettext-tools/tests/msgcat-stringtable-1
+++ b/gettext-tools/tests/msgcat-stringtable-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test reading in NeXTstep/GNUstep .strings syntax.
 
diff --git a/gettext-tools/tests/msgcmp-1 b/gettext-tools/tests/msgcmp-1
index dd7813783..e354dd675 100755
--- a/gettext-tools/tests/msgcmp-1
+++ b/gettext-tools/tests/msgcmp-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test a succeeding comparison.
 
diff --git a/gettext-tools/tests/msgcmp-2 b/gettext-tools/tests/msgcmp-2
index bf766e465..f0443b38c 100755
--- a/gettext-tools/tests/msgcmp-2
+++ b/gettext-tools/tests/msgcmp-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test a failing comparison.
 
diff --git a/gettext-tools/tests/msgcmp-3 b/gettext-tools/tests/msgcmp-3
index 5fc7f968b..ec19ae7e4 100755
--- a/gettext-tools/tests/msgcmp-3
+++ b/gettext-tools/tests/msgcmp-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test a failing comparison with Java .properties syntax.
 
diff --git a/gettext-tools/tests/msgcmp-4 b/gettext-tools/tests/msgcmp-4
index f16fe4ab7..ad1e7077a 100755
--- a/gettext-tools/tests/msgcmp-4
+++ b/gettext-tools/tests/msgcmp-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test comparison with PO files with previous msgids.
 # Test --use-fuzzy option.
diff --git a/gettext-tools/tests/msgcomm-1 b/gettext-tools/tests/msgcomm-1
index a7e483cdc..8eaabb049 100755
--- a/gettext-tools/tests/msgcomm-1
+++ b/gettext-tools/tests/msgcomm-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --more-than=0 option.
 
diff --git a/gettext-tools/tests/msgcomm-10 b/gettext-tools/tests/msgcomm-10
index 7f6a085bf..443fa86af 100755
--- a/gettext-tools/tests/msgcomm-10
+++ b/gettext-tools/tests/msgcomm-10
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test merge of common entries with --more-than=1 and --omit-header.
 
diff --git a/gettext-tools/tests/msgcomm-11 b/gettext-tools/tests/msgcomm-11
index 58af444af..0820872ee 100755
--- a/gettext-tools/tests/msgcomm-11
+++ b/gettext-tools/tests/msgcomm-11
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that --more-than=1 drops entries which occur only once.
 
diff --git a/gettext-tools/tests/msgcomm-12 b/gettext-tools/tests/msgcomm-12
index 75df966ed..675d651ac 100755
--- a/gettext-tools/tests/msgcomm-12
+++ b/gettext-tools/tests/msgcomm-12
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that --less-than=2 removes entries which occur twice and keeps entries
 # which occur only once.
diff --git a/gettext-tools/tests/msgcomm-13 b/gettext-tools/tests/msgcomm-13
index d8a08dbbd..3bf773781 100755
--- a/gettext-tools/tests/msgcomm-13
+++ b/gettext-tools/tests/msgcomm-13
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that --less-than=2 removes entries which occur more than twice.
 
diff --git a/gettext-tools/tests/msgcomm-14 b/gettext-tools/tests/msgcomm-14
index 253ec3223..10e688a91 100755
--- a/gettext-tools/tests/msgcomm-14
+++ b/gettext-tools/tests/msgcomm-14
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --force-po option.
 
diff --git a/gettext-tools/tests/msgcomm-15 b/gettext-tools/tests/msgcomm-15
index 06f558e8e..e85bdd3c5 100755
--- a/gettext-tools/tests/msgcomm-15
+++ b/gettext-tools/tests/msgcomm-15
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that without --force-po option, a PO file without translations is
 # not created.
diff --git a/gettext-tools/tests/msgcomm-16 b/gettext-tools/tests/msgcomm-16
index 13fb95ae5..7ebe18bd3 100755
--- a/gettext-tools/tests/msgcomm-16
+++ b/gettext-tools/tests/msgcomm-16
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of input files with different charsets.
 
diff --git a/gettext-tools/tests/msgcomm-17 b/gettext-tools/tests/msgcomm-17
index 92fa3ce92..67dfe0de0 100755
--- a/gettext-tools/tests/msgcomm-17
+++ b/gettext-tools/tests/msgcomm-17
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # -u, --unique (equivalent to --less-than=2): we are interested in unique
 # entries only (entries occurring less than 2 times).  But don't drop the
diff --git a/gettext-tools/tests/msgcomm-18 b/gettext-tools/tests/msgcomm-18
index ff8c23e36..0c929ed3d 100755
--- a/gettext-tools/tests/msgcomm-18
+++ b/gettext-tools/tests/msgcomm-18
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --more-than=0; identical message are wanted once only.
 
diff --git a/gettext-tools/tests/msgcomm-19 b/gettext-tools/tests/msgcomm-19
index 596c24be2..d7b4ad90e 100755
--- a/gettext-tools/tests/msgcomm-19
+++ b/gettext-tools/tests/msgcomm-19
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --more-than=0; identical message are wanted once only.
 # If the first occurrence is fuzzy, keep the fuzzy mark.
diff --git a/gettext-tools/tests/msgcomm-2 b/gettext-tools/tests/msgcomm-2
index 8c3c26662..be2b073a6 100755
--- a/gettext-tools/tests/msgcomm-2
+++ b/gettext-tools/tests/msgcomm-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --no-location option.
 
diff --git a/gettext-tools/tests/msgcomm-20 b/gettext-tools/tests/msgcomm-20
index 30a8c27fc..e78ead1c5 100755
--- a/gettext-tools/tests/msgcomm-20
+++ b/gettext-tools/tests/msgcomm-20
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --more-than=0; identical message are wanted once only.
 # If the first occurrence is not fuzzy, don't make the result fuzzy.
diff --git a/gettext-tools/tests/msgcomm-21 b/gettext-tools/tests/msgcomm-21
index 2be54e357..a3ed94637 100755
--- a/gettext-tools/tests/msgcomm-21
+++ b/gettext-tools/tests/msgcomm-21
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --more-than=0; identical message are wanted once only.
 # If both occurrences are fuzzy, keep the fuzzy mark.
diff --git a/gettext-tools/tests/msgcomm-22 b/gettext-tools/tests/msgcomm-22
index 42b28d30f..7b4906218 100755
--- a/gettext-tools/tests/msgcomm-22
+++ b/gettext-tools/tests/msgcomm-22
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify that the header entry is kept, otherwise the encoding is unknown.
 
diff --git a/gettext-tools/tests/msgcomm-23 b/gettext-tools/tests/msgcomm-23
index c7aefa3c7..b369464ea 100755
--- a/gettext-tools/tests/msgcomm-23
+++ b/gettext-tools/tests/msgcomm-23
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # "msgcomm INPUT INPUT" is equivalent to "msguniq INPUT"
 
@@ -6,8 +7,8 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles mcomm-23.in1 mcomm-23.in2"
-cp ${top_srcdir}/tests/msguniq-a.in mcomm-23.in1
-cp ${top_srcdir}/tests/msguniq-a.in mcomm-23.in2
+cp ../${srcdir}/msguniq-a.in mcomm-23.in1
+cp ../${srcdir}/msguniq-a.in mcomm-23.in2
 
 tmpfiles="$tmpfiles mcomm-23.tmp mcomm-23.out"
 : ${MSGCOMM=msgcomm}
@@ -17,7 +18,7 @@ LC_ALL=C tr -d '\r' < mcomm-23.tmp > mcomm-23.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
-${DIFF} ${top_srcdir}/tests/msguniq-a.out mcomm-23.out
+${DIFF} ../${srcdir}/msguniq-a.out mcomm-23.out
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgcomm-24 b/gettext-tools/tests/msgcomm-24
index dd40dfb74..6eddf8dee 100755
--- a/gettext-tools/tests/msgcomm-24
+++ b/gettext-tools/tests/msgcomm-24
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --more-than=0 option with Java .properties syntax.
 
diff --git a/gettext-tools/tests/msgcomm-25 b/gettext-tools/tests/msgcomm-25
index 8ec3fe880..8196dd36d 100755
--- a/gettext-tools/tests/msgcomm-25
+++ b/gettext-tools/tests/msgcomm-25
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgcomm on PO files with contexts.
 
diff --git a/gettext-tools/tests/msgcomm-26 b/gettext-tools/tests/msgcomm-26
index 0e79f8a59..ef9df7bf5 100755
--- a/gettext-tools/tests/msgcomm-26
+++ b/gettext-tools/tests/msgcomm-26
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgcomm on PO files with previous msgids.
 
diff --git a/gettext-tools/tests/msgcomm-27 b/gettext-tools/tests/msgcomm-27
index 09d423d75..7115e3d11 100755
--- a/gettext-tools/tests/msgcomm-27
+++ b/gettext-tools/tests/msgcomm-27
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of format and 'range:' flag.
 
diff --git a/gettext-tools/tests/msgcomm-3 b/gettext-tools/tests/msgcomm-3
index 66539ccfb..5d82f7a39 100755
--- a/gettext-tools/tests/msgcomm-3
+++ b/gettext-tools/tests/msgcomm-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --omit-header option when there is no header.
 
diff --git a/gettext-tools/tests/msgcomm-4 b/gettext-tools/tests/msgcomm-4
index e3579aff5..a419fa752 100755
--- a/gettext-tools/tests/msgcomm-4
+++ b/gettext-tools/tests/msgcomm-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test what happens with the header entry.
 
diff --git a/gettext-tools/tests/msgcomm-5 b/gettext-tools/tests/msgcomm-5
index 8442a5d51..b3159e930 100755
--- a/gettext-tools/tests/msgcomm-5
+++ b/gettext-tools/tests/msgcomm-5
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --omit-header option when there is a header.
 
diff --git a/gettext-tools/tests/msgcomm-6 b/gettext-tools/tests/msgcomm-6
index 6dca10b43..1abfa4ffa 100755
--- a/gettext-tools/tests/msgcomm-6
+++ b/gettext-tools/tests/msgcomm-6
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --no-location option when there is a header.
 
diff --git a/gettext-tools/tests/msgcomm-7 b/gettext-tools/tests/msgcomm-7
index 529cf735c..776b4b709 100755
--- a/gettext-tools/tests/msgcomm-7
+++ b/gettext-tools/tests/msgcomm-7
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --no-location and --omit-header options together.
 
diff --git a/gettext-tools/tests/msgcomm-8 b/gettext-tools/tests/msgcomm-8
index 76170fc72..0c5828906 100755
--- a/gettext-tools/tests/msgcomm-8
+++ b/gettext-tools/tests/msgcomm-8
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test merge of common entries with --more-than=1.
 
diff --git a/gettext-tools/tests/msgcomm-9 b/gettext-tools/tests/msgcomm-9
index fac28513b..b6da6db85 100755
--- a/gettext-tools/tests/msgcomm-9
+++ b/gettext-tools/tests/msgcomm-9
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test merge of common entries with --more-than=1 and --no-location.
 
diff --git a/gettext-tools/tests/msgconv-1 b/gettext-tools/tests/msgconv-1
index 576f9d633..b38864f50 100755
--- a/gettext-tools/tests/msgconv-1
+++ b/gettext-tools/tests/msgconv-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test conversion from BIG5 to UTF-8.
 
diff --git a/gettext-tools/tests/msgconv-2 b/gettext-tools/tests/msgconv-2
index 850a0431a..e3f523297 100755
--- a/gettext-tools/tests/msgconv-2
+++ b/gettext-tools/tests/msgconv-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test conversion from UTF-8 to BIG5.
 # Test that encoding names are case insensitive.
diff --git a/gettext-tools/tests/msgconv-3 b/gettext-tools/tests/msgconv-3
index 97582f111..8b8c2e269 100755
--- a/gettext-tools/tests/msgconv-3
+++ b/gettext-tools/tests/msgconv-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test failing conversion from ISO-8859-15 to ISO-8859-1.
 
diff --git a/gettext-tools/tests/msgconv-4 b/gettext-tools/tests/msgconv-4
index b41c89fd3..469a3b883 100755
--- a/gettext-tools/tests/msgconv-4
+++ b/gettext-tools/tests/msgconv-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test conversion from UTF-8 to BIG5 is a NOP with Java .properties syntax.
 # Test that encoding names are case insensitive.
diff --git a/gettext-tools/tests/msgconv-5 b/gettext-tools/tests/msgconv-5
index 3850c43ed..dcf52bd11 100755
--- a/gettext-tools/tests/msgconv-5
+++ b/gettext-tools/tests/msgconv-5
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgconv on a PO file with contexts.
 
diff --git a/gettext-tools/tests/msgconv-6 b/gettext-tools/tests/msgconv-6
index e6adc6525..8f01c9140 100755
--- a/gettext-tools/tests/msgconv-6
+++ b/gettext-tools/tests/msgconv-6
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgconv on a PO file with previous msgids.
 
diff --git a/gettext-tools/tests/msgen-1 b/gettext-tools/tests/msgen-1
index fc3983cf2..cb52c68f5 100755
--- a/gettext-tools/tests/msgen-1
+++ b/gettext-tools/tests/msgen-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test general operation.
 
diff --git a/gettext-tools/tests/msgen-2 b/gettext-tools/tests/msgen-2
index 12525d2e1..60575150b 100755
--- a/gettext-tools/tests/msgen-2
+++ b/gettext-tools/tests/msgen-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test general operation with Java .properties syntax.
 
diff --git a/gettext-tools/tests/msgen-3 b/gettext-tools/tests/msgen-3
index 9ff5fdb8e..318b330fc 100755
--- a/gettext-tools/tests/msgen-3
+++ b/gettext-tools/tests/msgen-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgen on a POT file with contexts.
 
diff --git a/gettext-tools/tests/msgexec-1 b/gettext-tools/tests/msgexec-1
index 855af8863..3809d8350 100755
--- a/gettext-tools/tests/msgexec-1
+++ b/gettext-tools/tests/msgexec-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of an external command.
 
diff --git a/gettext-tools/tests/msgexec-2 b/gettext-tools/tests/msgexec-2
index 94d61e9db..56371e0bf 100755
--- a/gettext-tools/tests/msgexec-2
+++ b/gettext-tools/tests/msgexec-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test the builtin command "0".
 
@@ -80,7 +81,7 @@ LC_ALL=C $TR -d '\r' < mex-test2.tmp > mex-test2.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${CMP=cmp}
-${CMP} ${top_srcdir}/tests/mex-test2.ok mex-test2.out >/dev/null 2>/dev/null
+${CMP} ../${srcdir}/mex-test2.ok mex-test2.out >/dev/null 2>/dev/null
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgexec-3 b/gettext-tools/tests/msgexec-3
index 7cc3bb5d5..771f06776 100755
--- a/gettext-tools/tests/msgexec-3
+++ b/gettext-tools/tests/msgexec-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of an external command with Java .properties syntax.
 
diff --git a/gettext-tools/tests/msgexec-4 b/gettext-tools/tests/msgexec-4
index 9683b4067..4f67a7b14 100755
--- a/gettext-tools/tests/msgexec-4
+++ b/gettext-tools/tests/msgexec-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgexec on a PO file with contexts.
 
diff --git a/gettext-tools/tests/msgfilter-1 b/gettext-tools/tests/msgfilter-1
index 6241e4418..5db883028 100755
--- a/gettext-tools/tests/msgfilter-1
+++ b/gettext-tools/tests/msgfilter-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test general filter execution.
 
diff --git a/gettext-tools/tests/msgfilter-2 b/gettext-tools/tests/msgfilter-2
index 20887cd95..c0e436f82 100755
--- a/gettext-tools/tests/msgfilter-2
+++ b/gettext-tools/tests/msgfilter-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test sed execution.
 
diff --git a/gettext-tools/tests/msgfilter-3 b/gettext-tools/tests/msgfilter-3
index e36df42c5..8ee5fc618 100755
--- a/gettext-tools/tests/msgfilter-3
+++ b/gettext-tools/tests/msgfilter-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test general filter execution with Java .properties syntax.
 
diff --git a/gettext-tools/tests/msgfilter-4 b/gettext-tools/tests/msgfilter-4
index d8cab872b..7017145d8 100755
--- a/gettext-tools/tests/msgfilter-4
+++ b/gettext-tools/tests/msgfilter-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgfilter on a PO file with contexts.
 
diff --git a/gettext-tools/tests/msgfilter-sr-latin-1 b/gettext-tools/tests/msgfilter-sr-latin-1
index a8c0eac43..69af7d33c 100755
--- a/gettext-tools/tests/msgfilter-sr-latin-1
+++ b/gettext-tools/tests/msgfilter-sr-latin-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgfilter with command recode-sr-latin1.
 # Verify that it converts to UTF-8.
diff --git a/gettext-tools/tests/msgfmt-1 b/gettext-tools/tests/msgfmt-1
index b44dded06..0e7315b2e 100755
--- a/gettext-tools/tests/msgfmt-1
+++ b/gettext-tools/tests/msgfmt-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test basic functionality, duplicate detection, multiple domains.
 
diff --git a/gettext-tools/tests/msgfmt-10 b/gettext-tools/tests/msgfmt-10
index 00229588c..70f0f6b9b 100755
--- a/gettext-tools/tests/msgfmt-10
+++ b/gettext-tools/tests/msgfmt-10
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test format string checking in plural entries.
 
diff --git a/gettext-tools/tests/msgfmt-11 b/gettext-tools/tests/msgfmt-11
index 0d8f1ffed..002d696af 100755
--- a/gettext-tools/tests/msgfmt-11
+++ b/gettext-tools/tests/msgfmt-11
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of invalid multibyte sequences.
 
diff --git a/gettext-tools/tests/msgfmt-12 b/gettext-tools/tests/msgfmt-12
index 1c2f6fa33..24743eb2c 100755
--- a/gettext-tools/tests/msgfmt-12
+++ b/gettext-tools/tests/msgfmt-12
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test ISO C 99 <inttypes.h> format string directives.
 
diff --git a/gettext-tools/tests/msgfmt-13 b/gettext-tools/tests/msgfmt-13
index 6822c8abc..d9cb0179b 100755
--- a/gettext-tools/tests/msgfmt-13
+++ b/gettext-tools/tests/msgfmt-13
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that an out-of-range Unicode character doesn't lead to a crash.
 
diff --git a/gettext-tools/tests/msgfmt-14 b/gettext-tools/tests/msgfmt-14
index 7b7d3d2d1..da9846251 100755
--- a/gettext-tools/tests/msgfmt-14
+++ b/gettext-tools/tests/msgfmt-14
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgfmt and msgunfmt on a PO file with contexts.
 
diff --git a/gettext-tools/tests/msgfmt-15 b/gettext-tools/tests/msgfmt-15
index b2712c61f..731b16a91 100755
--- a/gettext-tools/tests/msgfmt-15
+++ b/gettext-tools/tests/msgfmt-15
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test plural formula dependent checking of format strings.
 
diff --git a/gettext-tools/tests/msgfmt-16 b/gettext-tools/tests/msgfmt-16
index 440435108..deccad5ab 100755
--- a/gettext-tools/tests/msgfmt-16
+++ b/gettext-tools/tests/msgfmt-16
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgfmt on a PO file with previous msgids.
 
diff --git a/gettext-tools/tests/msgfmt-17 b/gettext-tools/tests/msgfmt-17
index b077030ad..44a730e5f 100755
--- a/gettext-tools/tests/msgfmt-17
+++ b/gettext-tools/tests/msgfmt-17
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test range dependent checking of format strings with plural forms.
 
diff --git a/gettext-tools/tests/msgfmt-2 b/gettext-tools/tests/msgfmt-2
index 743ab0817..fdaf965f3 100755
--- a/gettext-tools/tests/msgfmt-2
+++ b/gettext-tools/tests/msgfmt-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test basic functionality, duplicate detection, multiple domains.
 
diff --git a/gettext-tools/tests/msgfmt-3 b/gettext-tools/tests/msgfmt-3
index 49625e35c..fe40ee8fa 100755
--- a/gettext-tools/tests/msgfmt-3
+++ b/gettext-tools/tests/msgfmt-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that an empty header entry is OK.
 
diff --git a/gettext-tools/tests/msgfmt-4 b/gettext-tools/tests/msgfmt-4
index 43de254c1..3868c20c3 100755
--- a/gettext-tools/tests/msgfmt-4
+++ b/gettext-tools/tests/msgfmt-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test c-format handling.
 
diff --git a/gettext-tools/tests/msgfmt-5 b/gettext-tools/tests/msgfmt-5
index 0eee91a88..46c101b89 100755
--- a/gettext-tools/tests/msgfmt-5
+++ b/gettext-tools/tests/msgfmt-5
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test multi-domain handling.
 
diff --git a/gettext-tools/tests/msgfmt-6 b/gettext-tools/tests/msgfmt-6
index 5c7910769..f2a083704 100755
--- a/gettext-tools/tests/msgfmt-6
+++ b/gettext-tools/tests/msgfmt-6
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test catching of division by zero in plural expression.
 
diff --git a/gettext-tools/tests/msgfmt-7 b/gettext-tools/tests/msgfmt-7
index 0c7d96add..bdcf97f4d 100755
--- a/gettext-tools/tests/msgfmt-7
+++ b/gettext-tools/tests/msgfmt-7
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Check for duplicates with identical translations
 
diff --git a/gettext-tools/tests/msgfmt-8 b/gettext-tools/tests/msgfmt-8
index cc7c0623e..fd81344b3 100755
--- a/gettext-tools/tests/msgfmt-8
+++ b/gettext-tools/tests/msgfmt-8
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Check for duplicates with different translations
 
diff --git a/gettext-tools/tests/msgfmt-9 b/gettext-tools/tests/msgfmt-9
index 4e77327f3..470434124 100755
--- a/gettext-tools/tests/msgfmt-9
+++ b/gettext-tools/tests/msgfmt-9
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Duplicates are also fatal in obsolete marked entries.
 
diff --git a/gettext-tools/tests/msgfmt-properties-1 b/gettext-tools/tests/msgfmt-properties-1
index fad593b74..de9320a12 100755
--- a/gettext-tools/tests/msgfmt-properties-1
+++ b/gettext-tools/tests/msgfmt-properties-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test basic functioning with Java .properties syntax.
 
diff --git a/gettext-tools/tests/msgfmt-qt-1 b/gettext-tools/tests/msgfmt-qt-1
index 26b90a155..e506c2a1d 100755
--- a/gettext-tools/tests/msgfmt-qt-1
+++ b/gettext-tools/tests/msgfmt-qt-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test output in Qt .qm format.
 
@@ -7,11 +8,11 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles mf-qt-1.qm"
 : ${MSGFMT=msgfmt}
-${MSGFMT} --qt -o mf-qt-1.qm ${top_srcdir}/tests/qttest_pl.po
+${MSGFMT} --qt -o mf-qt-1.qm ../${srcdir}/qttest_pl.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${CMP=cmp}
-${CMP} ${top_srcdir}/tests/qttest_pl.qm mf-qt-1.qm >/dev/null 2>/dev/null
+${CMP} ../${srcdir}/qttest_pl.qm mf-qt-1.qm >/dev/null 2>/dev/null
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgfmt-qt-2 b/gettext-tools/tests/msgfmt-qt-2
index 1c6518b96..7820f6313 100755
--- a/gettext-tools/tests/msgfmt-qt-2
+++ b/gettext-tools/tests/msgfmt-qt-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgfmt --qt on a PO file with contexts.
 
@@ -7,11 +8,11 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles mf-qt-2.qm"
 : ${MSGFMT=msgfmt}
-${MSGFMT} --qt ${top_srcdir}/tests/qttest2_de.po -o mf-qt-2.qm
+${MSGFMT} --qt ../${srcdir}/qttest2_de.po -o mf-qt-2.qm
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${CMP=cmp}
-${CMP} ${top_srcdir}/tests/qttest2_de.qm mf-qt-2.qm >/dev/null 2>/dev/null
+${CMP} ../${srcdir}/qttest2_de.qm mf-qt-2.qm >/dev/null 2>/dev/null
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msggrep-1 b/gettext-tools/tests/msggrep-1
index 25b291a40..da2052900 100755
--- a/gettext-tools/tests/msggrep-1
+++ b/gettext-tools/tests/msggrep-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --location option.
 
diff --git a/gettext-tools/tests/msggrep-10 b/gettext-tools/tests/msggrep-10
index 9ca91c2ee..140ea6d53 100755
--- a/gettext-tools/tests/msggrep-10
+++ b/gettext-tools/tests/msggrep-10
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Verify that $ as end-of-line anchor does not cause a crash.
 # <https://bugzilla.redhat.com/show_bug.cgi?id=483181>
diff --git a/gettext-tools/tests/msggrep-2 b/gettext-tools/tests/msggrep-2
index 51ef1815b..c7047a5b1 100755
--- a/gettext-tools/tests/msggrep-2
+++ b/gettext-tools/tests/msggrep-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --domain option.
 
diff --git a/gettext-tools/tests/msggrep-3 b/gettext-tools/tests/msggrep-3
index 83f2e615e..5cd44b3a7 100755
--- a/gettext-tools/tests/msggrep-3
+++ b/gettext-tools/tests/msggrep-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --msgid and --msgstr options.
 
diff --git a/gettext-tools/tests/msggrep-4 b/gettext-tools/tests/msggrep-4
index 8e92d5f25..4677b0a18 100755
--- a/gettext-tools/tests/msggrep-4
+++ b/gettext-tools/tests/msggrep-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test multiple -e and multiple -f options.
 
diff --git a/gettext-tools/tests/msggrep-5 b/gettext-tools/tests/msggrep-5
index e2583e110..449490565 100755
--- a/gettext-tools/tests/msggrep-5
+++ b/gettext-tools/tests/msggrep-5
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --comment option.
 
diff --git a/gettext-tools/tests/msggrep-6 b/gettext-tools/tests/msggrep-6
index c57b52ab1..79b5a034b 100755
--- a/gettext-tools/tests/msggrep-6
+++ b/gettext-tools/tests/msggrep-6
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --msgid and --msgstr options with Java .properties syntax.
 
diff --git a/gettext-tools/tests/msggrep-7 b/gettext-tools/tests/msggrep-7
index caa2e2e97..287187cbf 100755
--- a/gettext-tools/tests/msggrep-7
+++ b/gettext-tools/tests/msggrep-7
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msggrep on a PO file with contexts.
 
diff --git a/gettext-tools/tests/msggrep-8 b/gettext-tools/tests/msggrep-8
index adc6cd3f7..42fef136c 100755
--- a/gettext-tools/tests/msggrep-8
+++ b/gettext-tools/tests/msggrep-8
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --extracted-comment option.
 
diff --git a/gettext-tools/tests/msggrep-9 b/gettext-tools/tests/msggrep-9
index 8ededc237..6a0750ce8 100755
--- a/gettext-tools/tests/msggrep-9
+++ b/gettext-tools/tests/msggrep-9
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test interpretation of $ as end-of-line anchor.
 
diff --git a/gettext-tools/tests/msginit-1 b/gettext-tools/tests/msginit-1
index 9cf69282b..820a35a4f 100755
--- a/gettext-tools/tests/msginit-1
+++ b/gettext-tools/tests/msginit-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test plural count for locales with nplurals != 2.
 
diff --git a/gettext-tools/tests/msginit-2 b/gettext-tools/tests/msginit-2
index 63edb6c8a..cbe681d9e 100755
--- a/gettext-tools/tests/msginit-2
+++ b/gettext-tools/tests/msginit-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msginit on a POT file with contexts.
 
diff --git a/gettext-tools/tests/msgmerge-1 b/gettext-tools/tests/msgmerge-1
index b122928fc..386f64e12 100755
--- a/gettext-tools/tests/msgmerge-1
+++ b/gettext-tools/tests/msgmerge-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test general operation and line wrapping.
 
diff --git a/gettext-tools/tests/msgmerge-10 b/gettext-tools/tests/msgmerge-10
index e8ef11f81..c108bb140 100755
--- a/gettext-tools/tests/msgmerge-10
+++ b/gettext-tools/tests/msgmerge-10
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test merging of a message which has plural forms in ref.pot but not
 # in def.po.
diff --git a/gettext-tools/tests/msgmerge-11 b/gettext-tools/tests/msgmerge-11
index 8902f443d..a0203f575 100755
--- a/gettext-tools/tests/msgmerge-11
+++ b/gettext-tools/tests/msgmerge-11
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test merging of a message which has plural forms in ref.pot but not
 # in def.po.
diff --git a/gettext-tools/tests/msgmerge-12 b/gettext-tools/tests/msgmerge-12
index 158a118c1..d6d629a99 100755
--- a/gettext-tools/tests/msgmerge-12
+++ b/gettext-tools/tests/msgmerge-12
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test merging of a message which has plural forms in def.po but not
 # in ref.pot.
diff --git a/gettext-tools/tests/msgmerge-13 b/gettext-tools/tests/msgmerge-13
index dea83f269..352186700 100755
--- a/gettext-tools/tests/msgmerge-13
+++ b/gettext-tools/tests/msgmerge-13
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test merging of a message which has c-format specified in ref.pot but not
 # in def.po.
diff --git a/gettext-tools/tests/msgmerge-14 b/gettext-tools/tests/msgmerge-14
index 2087a667b..ae94811eb 100755
--- a/gettext-tools/tests/msgmerge-14
+++ b/gettext-tools/tests/msgmerge-14
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test merging of a ref.pot in UTF-8 encoding against a def.po in legacy
 # encoding (that was produced from an older version of ref.pot, in ASCII
diff --git a/gettext-tools/tests/msgmerge-15 b/gettext-tools/tests/msgmerge-15
index a743e1c88..84d50f83e 100755
--- a/gettext-tools/tests/msgmerge-15
+++ b/gettext-tools/tests/msgmerge-15
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test pseudo-comments containing filenames that start with a digit.
 
diff --git a/gettext-tools/tests/msgmerge-16 b/gettext-tools/tests/msgmerge-16
index e5e590099..f23eb1f2b 100755
--- a/gettext-tools/tests/msgmerge-16
+++ b/gettext-tools/tests/msgmerge-16
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test non-ASCII msgids when the PO file and the POT file are in different
 # encodings.
diff --git a/gettext-tools/tests/msgmerge-17 b/gettext-tools/tests/msgmerge-17
index bc1bc6df5..c730cc917 100755
--- a/gettext-tools/tests/msgmerge-17
+++ b/gettext-tools/tests/msgmerge-17
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test that untranslated messages that are brought over from the .pot file
 # get the right number of msgstrs.
diff --git a/gettext-tools/tests/msgmerge-18 b/gettext-tools/tests/msgmerge-18
index f5d381349..f7b3bfc2b 100755
--- a/gettext-tools/tests/msgmerge-18
+++ b/gettext-tools/tests/msgmerge-18
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgmerge and msgcmp on a PO file with contexts.
 
diff --git a/gettext-tools/tests/msgmerge-19 b/gettext-tools/tests/msgmerge-19
index e3e3c2780..2a08ddf65 100755
--- a/gettext-tools/tests/msgmerge-19
+++ b/gettext-tools/tests/msgmerge-19
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgmerge --previous option.
 
diff --git a/gettext-tools/tests/msgmerge-2 b/gettext-tools/tests/msgmerge-2
index 7f857bfa9..f3564e3b1 100755
--- a/gettext-tools/tests/msgmerge-2
+++ b/gettext-tools/tests/msgmerge-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of duplicates.
 
diff --git a/gettext-tools/tests/msgmerge-20 b/gettext-tools/tests/msgmerge-20
index 09ce9cf22..0b53b6f25 100755
--- a/gettext-tools/tests/msgmerge-20
+++ b/gettext-tools/tests/msgmerge-20
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgmerge when the second argument is a PO file with obsolete messages
 # (e.g. the result of an earlier msgmerge operation).
diff --git a/gettext-tools/tests/msgmerge-21 b/gettext-tools/tests/msgmerge-21
index ca3544ddf..bc492766b 100755
--- a/gettext-tools/tests/msgmerge-21
+++ b/gettext-tools/tests/msgmerge-21
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgmerge when a message's flags have been changed from c-format to
 # kde-format. Reported by Chusslove Illich (Часлав Илић).
diff --git a/gettext-tools/tests/msgmerge-22 b/gettext-tools/tests/msgmerge-22
index 4b60cf8b3..d8c975db4 100755
--- a/gettext-tools/tests/msgmerge-22
+++ b/gettext-tools/tests/msgmerge-22
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgmerge when a msgid_plural changed but msgid remained the same.
 # Reported by Chusslove Illich (Часлав Илић).
diff --git a/gettext-tools/tests/msgmerge-23 b/gettext-tools/tests/msgmerge-23
index 073270dd0..b6d292785 100755
--- a/gettext-tools/tests/msgmerge-23
+++ b/gettext-tools/tests/msgmerge-23
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgmerge when a msgid_plural changed but msgid remained the same,
 # and --previous was specified.
diff --git a/gettext-tools/tests/msgmerge-24 b/gettext-tools/tests/msgmerge-24
index 95647815f..4e1c0a522 100755
--- a/gettext-tools/tests/msgmerge-24
+++ b/gettext-tools/tests/msgmerge-24
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msgmerge and msgcmp: handling of 'range:' flags.
 
diff --git a/gettext-tools/tests/msgmerge-3 b/gettext-tools/tests/msgmerge-3
index 0f8fd2d2f..92a04beb4 100755
--- a/gettext-tools/tests/msgmerge-3
+++ b/gettext-tools/tests/msgmerge-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of obsolete/untranslated messages.
 
diff --git a/gettext-tools/tests/msgmerge-4 b/gettext-tools/tests/msgmerge-4
index 904a4c616..6329d7083 100755
--- a/gettext-tools/tests/msgmerge-4
+++ b/gettext-tools/tests/msgmerge-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of comments.
 
diff --git a/gettext-tools/tests/msgmerge-5 b/gettext-tools/tests/msgmerge-5
index 69886f137..3c53aabc3 100755
--- a/gettext-tools/tests/msgmerge-5
+++ b/gettext-tools/tests/msgmerge-5
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of header entry.
 
diff --git a/gettext-tools/tests/msgmerge-6 b/gettext-tools/tests/msgmerge-6
index e8ffc71f0..93dabcd8f 100755
--- a/gettext-tools/tests/msgmerge-6
+++ b/gettext-tools/tests/msgmerge-6
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test non-ASCII character at the end of msgstr. (Triggered a glibc-2.1 bug.)
 
diff --git a/gettext-tools/tests/msgmerge-7 b/gettext-tools/tests/msgmerge-7
index a64111b71..bb4fc5bbb 100755
--- a/gettext-tools/tests/msgmerge-7
+++ b/gettext-tools/tests/msgmerge-7
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test multi-domain handling.
 
diff --git a/gettext-tools/tests/msgmerge-8 b/gettext-tools/tests/msgmerge-8
index 938197744..2bae7dbcd 100755
--- a/gettext-tools/tests/msgmerge-8
+++ b/gettext-tools/tests/msgmerge-8
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test multi-domain handling.
 
diff --git a/gettext-tools/tests/msgmerge-9 b/gettext-tools/tests/msgmerge-9
index 8379b5e1e..2477ec1c4 100755
--- a/gettext-tools/tests/msgmerge-9
+++ b/gettext-tools/tests/msgmerge-9
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Duplicates are also fatal in obsolete marked entries (cf. msgmerge-3).
 
diff --git a/gettext-tools/tests/msgmerge-compendium-1 b/gettext-tools/tests/msgmerge-compendium-1
index c8f3dbba1..8b949eb91 100755
--- a/gettext-tools/tests/msgmerge-compendium-1
+++ b/gettext-tools/tests/msgmerge-compendium-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test compendium option.
 
diff --git a/gettext-tools/tests/msgmerge-compendium-2 b/gettext-tools/tests/msgmerge-compendium-2
index 3613d0adb..61cad2204 100755
--- a/gettext-tools/tests/msgmerge-compendium-2
+++ b/gettext-tools/tests/msgmerge-compendium-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test compendium option with fuzziness.
 
diff --git a/gettext-tools/tests/msgmerge-compendium-3 b/gettext-tools/tests/msgmerge-compendium-3
index 743633c99..dc89ea57f 100755
--- a/gettext-tools/tests/msgmerge-compendium-3
+++ b/gettext-tools/tests/msgmerge-compendium-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test compendium option.
 
diff --git a/gettext-tools/tests/msgmerge-compendium-4 b/gettext-tools/tests/msgmerge-compendium-4
index 42b85461a..d119a5232 100755
--- a/gettext-tools/tests/msgmerge-compendium-4
+++ b/gettext-tools/tests/msgmerge-compendium-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test compendium option.  Use it there was no "old" PO file at all
 # (merely use /dev/null).
diff --git a/gettext-tools/tests/msgmerge-compendium-5 b/gettext-tools/tests/msgmerge-compendium-5
index 4e7327a28..d39b1abc9 100755
--- a/gettext-tools/tests/msgmerge-compendium-5
+++ b/gettext-tools/tests/msgmerge-compendium-5
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test compendium option with a large compendium.
 
@@ -8,14 +9,14 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 tmpfiles="$tmpfiles mm-c-5.tmp mm-c-5.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-5.tmp \
-  --compendium ${top_srcdir}/tests/mm-viet.comp.po \
-  /dev/null ${top_srcdir}/tests/mm-viet.pot
+  --compendium ../${srcdir}/mm-viet.comp.po \
+  /dev/null ../${srcdir}/mm-viet.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < mm-c-5.tmp > mm-c-5.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
-${DIFF} ${top_srcdir}/tests/mm-viet.out mm-c-5.out
+${DIFF} ../${srcdir}/mm-viet.out mm-c-5.out
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgmerge-compendium-6 b/gettext-tools/tests/msgmerge-compendium-6
index 89f38333a..eb2d64fbc 100755
--- a/gettext-tools/tests/msgmerge-compendium-6
+++ b/gettext-tools/tests/msgmerge-compendium-6
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test compendium option with mixed encodings.
 # 8 combinations total:
@@ -11,21 +12,21 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles mm-ko.utf-8.pot"
 : ${MSGCONV=msgconv}
-${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.pot ${top_srcdir}/tests/mm-ko.ascii.pot
+${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.pot ../${srcdir}/mm-ko.ascii.pot
 
 tmpfiles="$tmpfiles mm-ko.utf-8.po"
 : ${MSGCONV=msgconv}
-${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.po ${top_srcdir}/tests/mm-ko.euc-kr.po
+${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.po ../${srcdir}/mm-ko.euc-kr.po
 
 tmpfiles="$tmpfiles mm-ko-comp.utf-8.po"
 : ${MSGCONV=msgconv}
-${MSGCONV} --to-code=UTF-8 -o mm-ko-comp.utf-8.po ${top_srcdir}/tests/mm-ko-comp.euc-kr.po
+${MSGCONV} --to-code=UTF-8 -o mm-ko-comp.utf-8.po ../${srcdir}/mm-ko-comp.euc-kr.po
 
 tmpfiles="$tmpfiles mm-c-6-AEE.tmp mm-c-6-AEE.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-AEE.tmp \
-  --compendium ${top_srcdir}/tests/mm-ko-comp.euc-kr.po \
-  ${top_srcdir}/tests/mm-ko.euc-kr.po ${top_srcdir}/tests/mm-ko.ascii.pot
+  --compendium ../${srcdir}/mm-ko-comp.euc-kr.po \
+  ../${srcdir}/mm-ko.euc-kr.po ../${srcdir}/mm-ko.ascii.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < mm-c-6-AEE.tmp > mm-c-6-AEE.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
@@ -34,7 +35,7 @@ tmpfiles="$tmpfiles mm-c-6-AEU.tmp mm-c-6-AEU.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-AEU.tmp \
   --compendium mm-ko-comp.utf-8.po \
-  ${top_srcdir}/tests/mm-ko.euc-kr.po ${top_srcdir}/tests/mm-ko.ascii.pot
+  ../${srcdir}/mm-ko.euc-kr.po ../${srcdir}/mm-ko.ascii.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < mm-c-6-AEU.tmp > mm-c-6-AEU.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
@@ -42,8 +43,8 @@ test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 tmpfiles="$tmpfiles mm-c-6-AUE.tmp mm-c-6-AUE.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-AUE.tmp \
-  --compendium ${top_srcdir}/tests/mm-ko-comp.euc-kr.po \
-  mm-ko.utf-8.po ${top_srcdir}/tests/mm-ko.ascii.pot
+  --compendium ../${srcdir}/mm-ko-comp.euc-kr.po \
+  mm-ko.utf-8.po ../${srcdir}/mm-ko.ascii.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < mm-c-6-AUE.tmp > mm-c-6-AUE.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
@@ -52,7 +53,7 @@ tmpfiles="$tmpfiles mm-c-6-AUU.tmp mm-c-6-AUU.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-AUU.tmp \
   --compendium mm-ko-comp.utf-8.po \
-  mm-ko.utf-8.po ${top_srcdir}/tests/mm-ko.ascii.pot
+  mm-ko.utf-8.po ../${srcdir}/mm-ko.ascii.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < mm-c-6-AUU.tmp > mm-c-6-AUU.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
@@ -60,8 +61,8 @@ test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 tmpfiles="$tmpfiles mm-c-6-UEE.tmp mm-c-6-UEE.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-UEE.tmp \
-  --compendium ${top_srcdir}/tests/mm-ko-comp.euc-kr.po \
-  ${top_srcdir}/tests/mm-ko.euc-kr.po mm-ko.utf-8.pot
+  --compendium ../${srcdir}/mm-ko-comp.euc-kr.po \
+  ../${srcdir}/mm-ko.euc-kr.po mm-ko.utf-8.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < mm-c-6-UEE.tmp > mm-c-6-UEE.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
@@ -70,7 +71,7 @@ tmpfiles="$tmpfiles mm-c-6-UEU.tmp mm-c-6-UEU.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-UEU.tmp \
   --compendium mm-ko-comp.utf-8.po \
-  ${top_srcdir}/tests/mm-ko.euc-kr.po mm-ko.utf-8.pot
+  ../${srcdir}/mm-ko.euc-kr.po mm-ko.utf-8.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < mm-c-6-UEU.tmp > mm-c-6-UEU.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
@@ -78,7 +79,7 @@ test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 tmpfiles="$tmpfiles mm-c-6-UUE.tmp mm-c-6-UUE.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-UUE.tmp \
-  --compendium ${top_srcdir}/tests/mm-ko-comp.euc-kr.po \
+  --compendium ../${srcdir}/mm-ko-comp.euc-kr.po \
   mm-ko.utf-8.po mm-ko.utf-8.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < mm-c-6-UUE.tmp > mm-c-6-UUE.out
diff --git a/gettext-tools/tests/msgmerge-properties-1 b/gettext-tools/tests/msgmerge-properties-1
index eb329c28a..bf58c20c2 100755
--- a/gettext-tools/tests/msgmerge-properties-1
+++ b/gettext-tools/tests/msgmerge-properties-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test handling of obsolete/untranslated messages with Java .properties syntax.
 
diff --git a/gettext-tools/tests/msgmerge-properties-2 b/gettext-tools/tests/msgmerge-properties-2
index 37d2db60f..fee33e766 100755
--- a/gettext-tools/tests/msgmerge-properties-2
+++ b/gettext-tools/tests/msgmerge-properties-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --update: location changed, and xgettext comment added. Both changes
 # must be reflected in the resulting PO file. With Java .properties syntax.
diff --git a/gettext-tools/tests/msgmerge-update-1 b/gettext-tools/tests/msgmerge-update-1
index 8b167218f..c1dccadb5 100755
--- a/gettext-tools/tests/msgmerge-update-1
+++ b/gettext-tools/tests/msgmerge-update-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --update: nothing changed; don't normalize second message
 
diff --git a/gettext-tools/tests/msgmerge-update-2 b/gettext-tools/tests/msgmerge-update-2
index 6f4d4a0bc..765c052d6 100755
--- a/gettext-tools/tests/msgmerge-update-2
+++ b/gettext-tools/tests/msgmerge-update-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --update: location changed, and xgettext comment added. Both changes
 # must be reflected in the resulting PO file.
diff --git a/gettext-tools/tests/msgmerge-update-3 b/gettext-tools/tests/msgmerge-update-3
index 375f19baf..ddc9f3ac9 100755
--- a/gettext-tools/tests/msgmerge-update-3
+++ b/gettext-tools/tests/msgmerge-update-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --update: POT-Creation-Date changed. This change must not be reflected
 # in the resulting PO file; this is needed for projects which don't put the
diff --git a/gettext-tools/tests/msgmerge-update-4 b/gettext-tools/tests/msgmerge-update-4
index dfbe0be35..7f2e97831 100755
--- a/gettext-tools/tests/msgmerge-update-4
+++ b/gettext-tools/tests/msgmerge-update-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --update with --sort-output: POT-Creation-Date changed. This change
 # must not be reflected in the resulting PO file; this is needed for projects
diff --git a/gettext-tools/tests/msgunfmt-1 b/gettext-tools/tests/msgunfmt-1
index 5cce2751a..5cddfb0f4 100755
--- a/gettext-tools/tests/msgunfmt-1
+++ b/gettext-tools/tests/msgunfmt-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of general operation.
 
diff --git a/gettext-tools/tests/msgunfmt-2 b/gettext-tools/tests/msgunfmt-2
index 39f959b3c..3683854a0 100755
--- a/gettext-tools/tests/msgunfmt-2
+++ b/gettext-tools/tests/msgunfmt-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test ISO C 99 <inttypes.h> format string directives.
 # Verify that msgunfmt, applied to a .mo file of major revision 1 (with
diff --git a/gettext-tools/tests/msgunfmt-csharp-1 b/gettext-tools/tests/msgunfmt-csharp-1
index 5061700d6..24797348a 100755
--- a/gettext-tools/tests/msgunfmt-csharp-1
+++ b/gettext-tools/tests/msgunfmt-csharp-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of --csharp option.
 
@@ -54,12 +55,12 @@ msgstr "Fermer"
 EOF
 
 : ${MSGFMT=msgfmt}
-GETTEXTCSHARPLIBDIR=../../gettext-runtime/intl-csharp \
+GETTEXTCSHARPLIBDIR=../../../gettext-runtime/intl-csharp \
 ${MSGFMT} --csharp -d mu-cs-1 -r prog -l fr mu-cs-1/fr.po || exit 1
 
 : ${MSGUNFMT=msgunfmt}
-GETTEXTCSHARPEXEDIR=../src \
-GETTEXTCSHARPLIBDIR=../../gettext-runtime/intl-csharp \
+GETTEXTCSHARPEXEDIR=../../src \
+GETTEXTCSHARPLIBDIR=../../../gettext-runtime/intl-csharp \
 ${MSGUNFMT} --csharp -d mu-cs-1 -r prog -l fr -o mu-cs-1/prog.out || exit 1
 
 : ${MSGCAT=msgcat}
diff --git a/gettext-tools/tests/msgunfmt-java-1 b/gettext-tools/tests/msgunfmt-java-1
index ad6e70161..5e6f303ae 100755
--- a/gettext-tools/tests/msgunfmt-java-1
+++ b/gettext-tools/tests/msgunfmt-java-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of --java option.
 
@@ -61,7 +62,7 @@ ${MSGFMT} -j -d mu-java-1 -r prog -l fr mu-java-1/fr.po || exit 1
 
 : ${MSGUNFMT=msgunfmt}
 CLASSPATH=mu-java-1${CLASSPATH:+:$CLASSPATH} \
-GETTEXTJEXEDIR=../src GETTEXTJAR=../src/gettext.jar \
+GETTEXTJEXEDIR=../../src GETTEXTJAR=../../src/gettext.jar \
 ${MSGUNFMT} --java -d mu-java-1 -r prog -l fr -o mu-java-1/prog.out || exit 1
 
 : ${MSGCAT=msgcat}
diff --git a/gettext-tools/tests/msgunfmt-properties-1 b/gettext-tools/tests/msgunfmt-properties-1
index 7af68bc51..0cc7973e5 100755
--- a/gettext-tools/tests/msgunfmt-properties-1
+++ b/gettext-tools/tests/msgunfmt-properties-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of general operation with Java .properties syntax.
 
diff --git a/gettext-tools/tests/msgunfmt-tcl-1 b/gettext-tools/tests/msgunfmt-tcl-1
index bfe48e0eb..65a239e3b 100755
--- a/gettext-tools/tests/msgunfmt-tcl-1
+++ b/gettext-tools/tests/msgunfmt-tcl-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of --tcl option.
 
@@ -48,7 +49,7 @@ ${MSGFMT} --tcl -d mu-tcl-1-msgs -l fr mu-tcl-1-fr.po || exit 1
 
 tmpfiles="$tmpfiles mu-tcl-1-prog.out"
 : ${MSGUNFMT=msgunfmt}
-GETTEXTDATADIR=${top_srcdir}/src \
+GETTEXTDATADIR=../${top_srcdir}/src \
 ${MSGUNFMT} --tcl -d mu-tcl-1-msgs -l fr -o mu-tcl-1-prog.out || exit 1
 
 tmpfiles="$tmpfiles mu-tcl-1-prog.ok"
diff --git a/gettext-tools/tests/msguniq-1 b/gettext-tools/tests/msguniq-1
index e137d5138..5616f26bb 100755
--- a/gettext-tools/tests/msguniq-1
+++ b/gettext-tools/tests/msguniq-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test general operation.
 
@@ -7,13 +8,13 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles msguniq-1.tmp msguniq-1.out"
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} -w 1000 -o msguniq-1.tmp ${top_srcdir}/tests/msguniq-a.in
+${MSGUNIQ} -w 1000 -o msguniq-1.tmp ../${srcdir}/msguniq-a.in
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < msguniq-1.tmp > msguniq-1.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
-${DIFF} ${top_srcdir}/tests/msguniq-a.out msguniq-1.out
+${DIFF} ../${srcdir}/msguniq-a.out msguniq-1.out
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msguniq-2 b/gettext-tools/tests/msguniq-2
index d8c6a9942..45a54e79d 100755
--- a/gettext-tools/tests/msguniq-2
+++ b/gettext-tools/tests/msguniq-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --unique option.
 
@@ -7,7 +8,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles msguniq-2.tmp msguniq-2.out"
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} -w 1000 -u -o msguniq-2.tmp ${top_srcdir}/tests/msguniq-a.in
+${MSGUNIQ} -w 1000 -u -o msguniq-2.tmp ../${srcdir}/msguniq-a.in
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < msguniq-2.tmp > msguniq-2.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
diff --git a/gettext-tools/tests/msguniq-3 b/gettext-tools/tests/msguniq-3
index dcd5ee85a..5322b51e5 100755
--- a/gettext-tools/tests/msguniq-3
+++ b/gettext-tools/tests/msguniq-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --repeated option.
 
@@ -7,7 +8,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles msguniq-3.tmp msguniq-3.out"
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} -w 1000 -d -o msguniq-3.tmp ${top_srcdir}/tests/msguniq-a.in
+${MSGUNIQ} -w 1000 -d -o msguniq-3.tmp ../${srcdir}/msguniq-a.in
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < msguniq-3.tmp > msguniq-3.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
diff --git a/gettext-tools/tests/msguniq-4 b/gettext-tools/tests/msguniq-4
index 844b4bc52..1cd63b809 100755
--- a/gettext-tools/tests/msguniq-4
+++ b/gettext-tools/tests/msguniq-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test general operation with Java .properties syntax.
 
@@ -7,12 +8,12 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles msguniq-4.out"
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} --properties-input --properties-output -w 1000 -o msguniq-4.out ${top_srcdir}/tests/msguniq-a.inp
+${MSGUNIQ} --properties-input --properties-output -w 1000 -o msguniq-4.out ../${srcdir}/msguniq-a.inp
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles msguniq-4.ok"
 : ${MSGCAT-msgcat}
-${MSGCAT} --properties-output -w 1000 -o msguniq-4.ok ${top_srcdir}/tests/msguniq-a.out
+${MSGCAT} --properties-output -w 1000 -o msguniq-4.ok ../${srcdir}/msguniq-a.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
diff --git a/gettext-tools/tests/msguniq-5 b/gettext-tools/tests/msguniq-5
index 3e784e135..1f98acb83 100755
--- a/gettext-tools/tests/msguniq-5
+++ b/gettext-tools/tests/msguniq-5
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msguniq on a PO file with contexts.
 
diff --git a/gettext-tools/tests/msguniq-6 b/gettext-tools/tests/msguniq-6
index c9ded37ea..3fabbba02 100755
--- a/gettext-tools/tests/msguniq-6
+++ b/gettext-tools/tests/msguniq-6
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test msguniq on PO file with previous msgids.
 
diff --git a/gettext-tools/tests/plural-1 b/gettext-tools/tests/plural-1
index cb9c75a66..944374aa3 100644
--- a/gettext-tools/tests/plural-1
+++ b/gettext-tools/tests/plural-1
@@ -1,11 +1,12 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles plural-1-cake.tmp plural-1-cake.pot"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o plural-1-cake.tmp --omit-header --no-location ${top_srcdir}/tests/plural-1-prg.c
+${XGETTEXT} -o plural-1-cake.tmp --omit-header --no-location ../${srcdir}/plural-1-prg.c
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < plural-1-cake.tmp > plural-1-cake.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
@@ -66,15 +67,15 @@ ${DIFF} plural-1-fr.po.strip plural-1-fr.po.un || exit 1
 tmpfiles="$tmpfiles plural-1-cake.ok plural-1-cake.tmp cake.out"
 : ${DIFF=diff}
 echo 'un morceau de gateau' > plural-1-cake.ok
-LANGUAGE= ./cake fr 1 > plural-1-cake.tmp || exit 1
+LANGUAGE= ../cake fr 1 > plural-1-cake.tmp || exit 1
 LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || exit 1
 ${DIFF} plural-1-cake.ok cake.out || exit 1
 echo '2 morceaux de gateau' > plural-1-cake.ok
-LANGUAGE= ./cake fr 2 > plural-1-cake.tmp || exit 1
+LANGUAGE= ../cake fr 2 > plural-1-cake.tmp || exit 1
 LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || exit 1
 ${DIFF} plural-1-cake.ok cake.out || exit 1
 echo '10 morceaux de gateau' > plural-1-cake.ok
-LANGUAGE= ./cake fr 10 > plural-1-cake.tmp || exit 1
+LANGUAGE= ../cake fr 10 > plural-1-cake.tmp || exit 1
 LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || exit 1
 ${DIFF} plural-1-cake.ok cake.out || exit 1
 
diff --git a/gettext-tools/tests/plural-2 b/gettext-tools/tests/plural-2
index 2593ced21..d5ffbb0de 100755
--- a/gettext-tools/tests/plural-2
+++ b/gettext-tools/tests/plural-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
diff --git a/gettext-tools/tests/recode-sr-latin-1 b/gettext-tools/tests/recode-sr-latin-1
index 9565a3689..eca50d07e 100755
--- a/gettext-tools/tests/recode-sr-latin-1
+++ b/gettext-tools/tests/recode-sr-latin-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recode-sr-latin on some input in UTF-8 encoding.
 
@@ -8,7 +9,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 # Test whether a specific UTF-8 locale is installed.
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ./testlocale 2>/dev/null
+  LC_ALL=$LOCALE_FR_UTF8 ../testlocale 2>/dev/null
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
diff --git a/gettext-tools/tests/recode-sr-latin-2 b/gettext-tools/tests/recode-sr-latin-2
index 83bd83b36..6fe955907 100755
--- a/gettext-tools/tests/recode-sr-latin-2
+++ b/gettext-tools/tests/recode-sr-latin-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recode-sr-latin on some input in EUC-JP encoding.
 # (Apart from UTF-8 and GB18030, EUC-JP is the only common encoding that is
diff --git a/gettext-tools/tests/xgettext-1 b/gettext-tools/tests/xgettext-1
index 69a9fdb55..64e501891 100755
--- a/gettext-tools/tests/xgettext-1
+++ b/gettext-tools/tests/xgettext-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # This test often fails during development. It works after "make dist".
 
@@ -11,8 +12,8 @@ tmpfiles="$tmpfiles zero-domain.po xg-test1.err"
 rm -f zero-domain.po
 : ${XGETTEXT=xgettext}
 LC_MESSAGES=C LC_ALL= \
-${XGETTEXT} -k_ -d zero-domain -x $top_srcdir/po/gettext-tools.pot \
-  $top_srcdir/src/xgettext.c >xg-test1.err 2>&1
+${XGETTEXT} -k_ -d zero-domain -x ../$top_srcdir/po/gettext-tools.pot \
+  ../$top_srcdir/src/xgettext.c >xg-test1.err 2>&1
 result=$?
 cat xg-test1.err | grep -v 'warning: Charset' | grep -v '^ '
 test $result = 0 || { rm -fr $tmpfiles; exit 1; }
diff --git a/gettext-tools/tests/xgettext-2 b/gettext-tools/tests/xgettext-2
index 5e50b5088..98424c2ab 100755
--- a/gettext-tools/tests/xgettext-2
+++ b/gettext-tools/tests/xgettext-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Even an empty string is extracted, if not overridden by xgettext's
 # default-constructed header entry.
diff --git a/gettext-tools/tests/xgettext-3 b/gettext-tools/tests/xgettext-3
index 9e1fb317e..ad77cd214 100755
--- a/gettext-tools/tests/xgettext-3
+++ b/gettext-tools/tests/xgettext-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # When a header entry is provided by xgettext, it overrides any msgid ""
 # present in the input.
diff --git a/gettext-tools/tests/xgettext-4 b/gettext-tools/tests/xgettext-4
index f648666d8..db01bbabf 100755
--- a/gettext-tools/tests/xgettext-4
+++ b/gettext-tools/tests/xgettext-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --foreign-user
 
diff --git a/gettext-tools/tests/xgettext-5 b/gettext-tools/tests/xgettext-5
index c654612db..721cdb568 100755
--- a/gettext-tools/tests/xgettext-5
+++ b/gettext-tools/tests/xgettext-5
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test extraction of non-ASCII msgids.
 
diff --git a/gettext-tools/tests/xgettext-6 b/gettext-tools/tests/xgettext-6
index d0997b566..df577860b 100755
--- a/gettext-tools/tests/xgettext-6
+++ b/gettext-tools/tests/xgettext-6
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of position dependent recognition of format strings.
 
diff --git a/gettext-tools/tests/xgettext-7 b/gettext-tools/tests/xgettext-7
index 3eddc1b64..adac2c5c5 100755
--- a/gettext-tools/tests/xgettext-7
+++ b/gettext-tools/tests/xgettext-7
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of comment extraction in the case of duplicated msgids.
 
diff --git a/gettext-tools/tests/xgettext-8 b/gettext-tools/tests/xgettext-8
index 10a4f1054..910d76c92 100755
--- a/gettext-tools/tests/xgettext-8
+++ b/gettext-tools/tests/xgettext-8
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test -j option with charset conversion from ISO-8859-1 to UTF-8.
 
diff --git a/gettext-tools/tests/xgettext-9 b/gettext-tools/tests/xgettext-9
index 75d3576e5..ea38b7050 100755
--- a/gettext-tools/tests/xgettext-9
+++ b/gettext-tools/tests/xgettext-9
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of extracted comments specified per keyword, including the case of
 # duplicated msgids.
diff --git a/gettext-tools/tests/xgettext-awk-1 b/gettext-tools/tests/xgettext-awk-1
index 7d3f95483..f16ff8d83 100755
--- a/gettext-tools/tests/xgettext-awk-1
+++ b/gettext-tools/tests/xgettext-awk-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test awk support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-awk-2 b/gettext-tools/tests/xgettext-awk-2
index 5ff65dcd6..c15dbd060 100755
--- a/gettext-tools/tests/xgettext-awk-2
+++ b/gettext-tools/tests/xgettext-awk-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test awk support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-c-1 b/gettext-tools/tests/xgettext-c-1
index 58bb1930b..f129b99af 100755
--- a/gettext-tools/tests/xgettext-c-1
+++ b/gettext-tools/tests/xgettext-c-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # This test often fails during development. It works after "make dist".
 
@@ -10,13 +11,13 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 tmpfiles="$tmpfiles xg-c-1.tmp.po xg-c-1.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -d xg-c-1.tmp -k_ --omit-header --no-location \
- $top_srcdir/src/xgettext.c $top_srcdir/src/msgfmt.c
+ ../$top_srcdir/src/xgettext.c ../$top_srcdir/src/msgfmt.c
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < xg-c-1.tmp.po > xg-c-1.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
-${DIFF} $top_srcdir/tests/xg-c-1.ok.po xg-c-1.po
+${DIFF} ../$srcdir/xg-c-1.ok.po xg-c-1.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-c-10 b/gettext-tools/tests/xgettext-c-10
index bf6fddadc..9a6d7beb0 100755
--- a/gettext-tools/tests/xgettext-c-10
+++ b/gettext-tools/tests/xgettext-c-10
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: extraction of contexts.
 
diff --git a/gettext-tools/tests/xgettext-c-11 b/gettext-tools/tests/xgettext-c-11
index 1dd854fb6..69d58b4e6 100755
--- a/gettext-tools/tests/xgettext-c-11
+++ b/gettext-tools/tests/xgettext-c-11
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: extraction of contexts, disambiguating according to the
 # argument count.
diff --git a/gettext-tools/tests/xgettext-c-12 b/gettext-tools/tests/xgettext-c-12
index b138dcbb7..8579772d5 100755
--- a/gettext-tools/tests/xgettext-c-12
+++ b/gettext-tools/tests/xgettext-c-12
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: valid but unlikely C format strings are _not_ marked as
 # c-format by default.
diff --git a/gettext-tools/tests/xgettext-c-13 b/gettext-tools/tests/xgettext-c-13
index 94d567f0d..c78c01b96 100755
--- a/gettext-tools/tests/xgettext-c-13
+++ b/gettext-tools/tests/xgettext-c-13
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C++ support: test --flag that introduces qt-format.
 
diff --git a/gettext-tools/tests/xgettext-c-14 b/gettext-tools/tests/xgettext-c-14
index 8368ecea6..790331350 100755
--- a/gettext-tools/tests/xgettext-c-14
+++ b/gettext-tools/tests/xgettext-c-14
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C++ support: test boost-format.
 
diff --git a/gettext-tools/tests/xgettext-c-15 b/gettext-tools/tests/xgettext-c-15
index 5cf9252cd..85d07060e 100755
--- a/gettext-tools/tests/xgettext-c-15
+++ b/gettext-tools/tests/xgettext-c-15
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: extraction of contexts specified in GNOME glib syntax.
 
diff --git a/gettext-tools/tests/xgettext-c-16 b/gettext-tools/tests/xgettext-c-16
index 801ff4900..15c19c8ff 100755
--- a/gettext-tools/tests/xgettext-c-16
+++ b/gettext-tools/tests/xgettext-c-16
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-c-17 b/gettext-tools/tests/xgettext-c-17
index 7cae3df29..169e02004 100755
--- a/gettext-tools/tests/xgettext-c-17
+++ b/gettext-tools/tests/xgettext-c-17
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C++ support: test kde-format and format recognition heuristics.
 
diff --git a/gettext-tools/tests/xgettext-c-18 b/gettext-tools/tests/xgettext-c-18
index 62457a236..28577ee11 100755
--- a/gettext-tools/tests/xgettext-c-18
+++ b/gettext-tools/tests/xgettext-c-18
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: extraction of 'range:' flags.
 
diff --git a/gettext-tools/tests/xgettext-c-2 b/gettext-tools/tests/xgettext-c-2
index 2c07dc8ab..c663ded7d 100755
--- a/gettext-tools/tests/xgettext-c-2
+++ b/gettext-tools/tests/xgettext-c-2
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: comments meant for xgettext, and whitespace.
 
diff --git a/gettext-tools/tests/xgettext-c-3 b/gettext-tools/tests/xgettext-c-3
index 6cf1d84ba..41ef3e1e7 100755
--- a/gettext-tools/tests/xgettext-c-3
+++ b/gettext-tools/tests/xgettext-c-3
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: recognition of #line.
 
diff --git a/gettext-tools/tests/xgettext-c-4 b/gettext-tools/tests/xgettext-c-4
index e5520dd11..9df69a3c5 100755
--- a/gettext-tools/tests/xgettext-c-4
+++ b/gettext-tools/tests/xgettext-c-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: --trigraphs option.
 
diff --git a/gettext-tools/tests/xgettext-c-5 b/gettext-tools/tests/xgettext-c-5
index a0bb7987e..eff40727a 100755
--- a/gettext-tools/tests/xgettext-c-5
+++ b/gettext-tools/tests/xgettext-c-5
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: comments.
 
diff --git a/gettext-tools/tests/xgettext-c-6 b/gettext-tools/tests/xgettext-c-6
index 050dde38c..86dfa9389 100755
--- a/gettext-tools/tests/xgettext-c-6
+++ b/gettext-tools/tests/xgettext-c-6
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-c-7 b/gettext-tools/tests/xgettext-c-7
index 8264f0f87..2dcec6011 100755
--- a/gettext-tools/tests/xgettext-c-7
+++ b/gettext-tools/tests/xgettext-c-7
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: comments.
 
diff --git a/gettext-tools/tests/xgettext-c-8 b/gettext-tools/tests/xgettext-c-8
index 1a085bae8..43dfebe9a 100755
--- a/gettext-tools/tests/xgettext-c-8
+++ b/gettext-tools/tests/xgettext-c-8
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test recognition of ISO C 99 <inttypes.h> format string directives.
 
diff --git a/gettext-tools/tests/xgettext-c-9 b/gettext-tools/tests/xgettext-c-9
index 242df178d..b75abb823 100755
--- a/gettext-tools/tests/xgettext-c-9
+++ b/gettext-tools/tests/xgettext-c-9
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-csharp-1 b/gettext-tools/tests/xgettext-csharp-1
index 9f35c93d4..0c5b88b83 100755
--- a/gettext-tools/tests/xgettext-csharp-1
+++ b/gettext-tools/tests/xgettext-csharp-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Some tests for C# support
 
diff --git a/gettext-tools/tests/xgettext-csharp-2 b/gettext-tools/tests/xgettext-csharp-2
index c5c0f5605..c3c72aaf8 100755
--- a/gettext-tools/tests/xgettext-csharp-2
+++ b/gettext-tools/tests/xgettext-csharp-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # More tests for C# support: UTF-8 encoded source files
 
diff --git a/gettext-tools/tests/xgettext-csharp-3 b/gettext-tools/tests/xgettext-csharp-3
index c7d287889..432b218e1 100755
--- a/gettext-tools/tests/xgettext-csharp-3
+++ b/gettext-tools/tests/xgettext-csharp-3
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # More tests for C# support: string syntax
 
diff --git a/gettext-tools/tests/xgettext-csharp-4 b/gettext-tools/tests/xgettext-csharp-4
index 4a32acccf..a47f8ab09 100755
--- a/gettext-tools/tests/xgettext-csharp-4
+++ b/gettext-tools/tests/xgettext-csharp-4
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Tests for C# plural keyword support
 
diff --git a/gettext-tools/tests/xgettext-csharp-5 b/gettext-tools/tests/xgettext-csharp-5
index 0b0ba3ac0..77acd94fb 100755
--- a/gettext-tools/tests/xgettext-csharp-5
+++ b/gettext-tools/tests/xgettext-csharp-5
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C# support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-csharp-6 b/gettext-tools/tests/xgettext-csharp-6
index 7a3070821..c3714d674 100755
--- a/gettext-tools/tests/xgettext-csharp-6
+++ b/gettext-tools/tests/xgettext-csharp-6
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C# support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-csharp-7 b/gettext-tools/tests/xgettext-csharp-7
index ac871fdf4..38025fe20 100755
--- a/gettext-tools/tests/xgettext-csharp-7
+++ b/gettext-tools/tests/xgettext-csharp-7
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C# support: extraction of contexts.
 
diff --git a/gettext-tools/tests/xgettext-elisp-1 b/gettext-tools/tests/xgettext-elisp-1
index e0086193a..b9b660d90 100755
--- a/gettext-tools/tests/xgettext-elisp-1
+++ b/gettext-tools/tests/xgettext-elisp-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test EmacsLisp support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-elisp-2 b/gettext-tools/tests/xgettext-elisp-2
index 85d139543..a457858fc 100755
--- a/gettext-tools/tests/xgettext-elisp-2
+++ b/gettext-tools/tests/xgettext-elisp-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test EmacsLisp support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-glade-1 b/gettext-tools/tests/xgettext-glade-1
index 5d2aa24e3..2fd7d3513 100755
--- a/gettext-tools/tests/xgettext-glade-1
+++ b/gettext-tools/tests/xgettext-glade-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Glade support.
 
diff --git a/gettext-tools/tests/xgettext-glade-2 b/gettext-tools/tests/xgettext-glade-2
index 36c0c3bae..780d9efb4 100755
--- a/gettext-tools/tests/xgettext-glade-2
+++ b/gettext-tools/tests/xgettext-glade-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Glade support, in particular ISO-8859-1 to UTF-8 conversion
 # and ASCII entities (&lt; &gt; &quot;).
diff --git a/gettext-tools/tests/xgettext-glade-3 b/gettext-tools/tests/xgettext-glade-3
index f929ae5e3..c4ecc8443 100755
--- a/gettext-tools/tests/xgettext-glade-3
+++ b/gettext-tools/tests/xgettext-glade-3
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Glade 2 support.
 
diff --git a/gettext-tools/tests/xgettext-glade-4 b/gettext-tools/tests/xgettext-glade-4
index f00419f21..546a11033 100755
--- a/gettext-tools/tests/xgettext-glade-4
+++ b/gettext-tools/tests/xgettext-glade-4
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Glade 2 support.
 
diff --git a/gettext-tools/tests/xgettext-glade-5 b/gettext-tools/tests/xgettext-glade-5
index 6354febc3..807a63c79 100755
--- a/gettext-tools/tests/xgettext-glade-5
+++ b/gettext-tools/tests/xgettext-glade-5
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Glade 2 support for msgctxt.
 
diff --git a/gettext-tools/tests/xgettext-glade-6 b/gettext-tools/tests/xgettext-glade-6
index 90940b795..cfc770876 100755
--- a/gettext-tools/tests/xgettext-glade-6
+++ b/gettext-tools/tests/xgettext-glade-6
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of GtkBuilder support.
 # Checks that the extracted pot contains the right translatable
diff --git a/gettext-tools/tests/xgettext-glade-7 b/gettext-tools/tests/xgettext-glade-7
index 09624f856..168c8f443 100755
--- a/gettext-tools/tests/xgettext-glade-7
+++ b/gettext-tools/tests/xgettext-glade-7
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of GtkBuilder support.
 # Checks the extraction of a medium size GtkBuilder file, with
diff --git a/gettext-tools/tests/xgettext-java-1 b/gettext-tools/tests/xgettext-java-1
index 62e1de11d..d517e9c74 100755
--- a/gettext-tools/tests/xgettext-java-1
+++ b/gettext-tools/tests/xgettext-java-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 #
 # Some tests for java support
 #
diff --git a/gettext-tools/tests/xgettext-java-2 b/gettext-tools/tests/xgettext-java-2
index bdf0444e9..d7afb2e81 100755
--- a/gettext-tools/tests/xgettext-java-2
+++ b/gettext-tools/tests/xgettext-java-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 #
 # More tests for java support
 #
diff --git a/gettext-tools/tests/xgettext-java-3 b/gettext-tools/tests/xgettext-java-3
index 61356dda9..7adbd1063 100755
--- a/gettext-tools/tests/xgettext-java-3
+++ b/gettext-tools/tests/xgettext-java-3
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 #
 # Some tests for java plural keyword support
 #
diff --git a/gettext-tools/tests/xgettext-java-4 b/gettext-tools/tests/xgettext-java-4
index b33676695..9ed7b8e24 100755
--- a/gettext-tools/tests/xgettext-java-4
+++ b/gettext-tools/tests/xgettext-java-4
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 #
 # Some tests for java plural keyword support
 #
diff --git a/gettext-tools/tests/xgettext-java-5 b/gettext-tools/tests/xgettext-java-5
index 09f3be9ed..14447cd2a 100755
--- a/gettext-tools/tests/xgettext-java-5
+++ b/gettext-tools/tests/xgettext-java-5
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Java support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-java-6 b/gettext-tools/tests/xgettext-java-6
index 862fc47fd..91593ed08 100755
--- a/gettext-tools/tests/xgettext-java-6
+++ b/gettext-tools/tests/xgettext-java-6
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Java support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-java-7 b/gettext-tools/tests/xgettext-java-7
index caa2b93b8..b929b5b10 100755
--- a/gettext-tools/tests/xgettext-java-7
+++ b/gettext-tools/tests/xgettext-java-7
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Java support: extraction of contexts.
 
diff --git a/gettext-tools/tests/xgettext-javascript-1 b/gettext-tools/tests/xgettext-javascript-1
index 986265626..57a832df7 100755
--- a/gettext-tools/tests/xgettext-javascript-1
+++ b/gettext-tools/tests/xgettext-javascript-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of JavaScript support.
 
diff --git a/gettext-tools/tests/xgettext-javascript-2 b/gettext-tools/tests/xgettext-javascript-2
index f931b6009..57c6a4121 100755
--- a/gettext-tools/tests/xgettext-javascript-2
+++ b/gettext-tools/tests/xgettext-javascript-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of JavaScript support.
 # Playing with regex and division operator
diff --git a/gettext-tools/tests/xgettext-javascript-3 b/gettext-tools/tests/xgettext-javascript-3
index 112edda42..c7dd9565c 100755
--- a/gettext-tools/tests/xgettext-javascript-3
+++ b/gettext-tools/tests/xgettext-javascript-3
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of JavaScript support.
 # Playing with concatenation of string literals within the gettext function
diff --git a/gettext-tools/tests/xgettext-javascript-4 b/gettext-tools/tests/xgettext-javascript-4
index 3b4ff4772..58151eeff 100755
--- a/gettext-tools/tests/xgettext-javascript-4
+++ b/gettext-tools/tests/xgettext-javascript-4
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of JavaScript escape sequences in string literals.
 
diff --git a/gettext-tools/tests/xgettext-javascript-5 b/gettext-tools/tests/xgettext-javascript-5
index 6e6164d49..08b1dc42b 100755
--- a/gettext-tools/tests/xgettext-javascript-5
+++ b/gettext-tools/tests/xgettext-javascript-5
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of JavaScript Unicode support.
 
diff --git a/gettext-tools/tests/xgettext-librep-1 b/gettext-tools/tests/xgettext-librep-1
index 23cae61c9..2f17e6223 100755
--- a/gettext-tools/tests/xgettext-librep-1
+++ b/gettext-tools/tests/xgettext-librep-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test librep support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-librep-2 b/gettext-tools/tests/xgettext-librep-2
index 72b3c158b..518c4685f 100755
--- a/gettext-tools/tests/xgettext-librep-2
+++ b/gettext-tools/tests/xgettext-librep-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test librep support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-lisp-1 b/gettext-tools/tests/xgettext-lisp-1
index 21ebd403d..9f34dc8d7 100755
--- a/gettext-tools/tests/xgettext-lisp-1
+++ b/gettext-tools/tests/xgettext-lisp-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Lisp support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-lisp-2 b/gettext-tools/tests/xgettext-lisp-2
index 86daea8ff..6aaea225e 100755
--- a/gettext-tools/tests/xgettext-lisp-2
+++ b/gettext-tools/tests/xgettext-lisp-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Lisp support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-lua-1 b/gettext-tools/tests/xgettext-lua-1
index bad25b461..98270dfbe 100755
--- a/gettext-tools/tests/xgettext-lua-1
+++ b/gettext-tools/tests/xgettext-lua-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Lua support
 
diff --git a/gettext-tools/tests/xgettext-lua-2 b/gettext-tools/tests/xgettext-lua-2
index 4bd9fbbd9..46773b770 100755
--- a/gettext-tools/tests/xgettext-lua-2
+++ b/gettext-tools/tests/xgettext-lua-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Lua support
 
diff --git a/gettext-tools/tests/xgettext-objc-1 b/gettext-tools/tests/xgettext-objc-1
index d2200edd7..73cacda38 100755
--- a/gettext-tools/tests/xgettext-objc-1
+++ b/gettext-tools/tests/xgettext-objc-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test ObjectiveC extractor.
 
diff --git a/gettext-tools/tests/xgettext-objc-2 b/gettext-tools/tests/xgettext-objc-2
index e9077d153..8fdb057ba 100755
--- a/gettext-tools/tests/xgettext-objc-2
+++ b/gettext-tools/tests/xgettext-objc-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test ObjectiveC support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-perl-1 b/gettext-tools/tests/xgettext-perl-1
index 68e1f9f93..841e9c600 100755
--- a/gettext-tools/tests/xgettext-perl-1
+++ b/gettext-tools/tests/xgettext-perl-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Perl support.
 
diff --git a/gettext-tools/tests/xgettext-perl-2 b/gettext-tools/tests/xgettext-perl-2
index 87c835793..413d332bf 100755
--- a/gettext-tools/tests/xgettext-perl-2
+++ b/gettext-tools/tests/xgettext-perl-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Perl support with ISO-8859-1 encoded input.
 
diff --git a/gettext-tools/tests/xgettext-perl-3 b/gettext-tools/tests/xgettext-perl-3
index 95f5e3418..70fe93453 100755
--- a/gettext-tools/tests/xgettext-perl-3
+++ b/gettext-tools/tests/xgettext-perl-3
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Perl support with UTF-8 encoded input.
 
diff --git a/gettext-tools/tests/xgettext-perl-4 b/gettext-tools/tests/xgettext-perl-4
index 566b40bcc..4ab943fb0 100755
--- a/gettext-tools/tests/xgettext-perl-4
+++ b/gettext-tools/tests/xgettext-perl-4
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Tests for the general string extraction facilities of the Perl backend
 # (with option --extract-all).
diff --git a/gettext-tools/tests/xgettext-perl-5 b/gettext-tools/tests/xgettext-perl-5
index 2783070ce..31ee5a2a4 100755
--- a/gettext-tools/tests/xgettext-perl-5
+++ b/gettext-tools/tests/xgettext-perl-5
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Perl support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-perl-6 b/gettext-tools/tests/xgettext-perl-6
index 02b9820bb..bda2f669d 100755
--- a/gettext-tools/tests/xgettext-perl-6
+++ b/gettext-tools/tests/xgettext-perl-6
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test whether the right number of arguments are extracted.
 
diff --git a/gettext-tools/tests/xgettext-perl-7 b/gettext-tools/tests/xgettext-perl-7
index c62de1049..557b002cd 100755
--- a/gettext-tools/tests/xgettext-perl-7
+++ b/gettext-tools/tests/xgettext-perl-7
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Perl support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-perl-8 b/gettext-tools/tests/xgettext-perl-8
index 74247cd34..2de1b796e 100755
--- a/gettext-tools/tests/xgettext-perl-8
+++ b/gettext-tools/tests/xgettext-perl-8
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # The slash (/) and the question mark (?) serve a double-purpose in Perl.
 # Depending on the context they can either be an operator (division
diff --git a/gettext-tools/tests/xgettext-php-1 b/gettext-tools/tests/xgettext-php-1
index eaf749878..36a85f0d1 100755
--- a/gettext-tools/tests/xgettext-php-1
+++ b/gettext-tools/tests/xgettext-php-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test PHP support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-php-2 b/gettext-tools/tests/xgettext-php-2
index 5de8eb551..028e83278 100755
--- a/gettext-tools/tests/xgettext-php-2
+++ b/gettext-tools/tests/xgettext-php-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test PHP support: here documents.
 
diff --git a/gettext-tools/tests/xgettext-php-3 b/gettext-tools/tests/xgettext-php-3
index 6da2caf52..6623d70e3 100755
--- a/gettext-tools/tests/xgettext-php-3
+++ b/gettext-tools/tests/xgettext-php-3
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test PHP support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-php-4 b/gettext-tools/tests/xgettext-php-4
index 4546da3a3..69ebd81f1 100755
--- a/gettext-tools/tests/xgettext-php-4
+++ b/gettext-tools/tests/xgettext-php-4
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test PHP support: string concatenation.
 
diff --git a/gettext-tools/tests/xgettext-po-1 b/gettext-tools/tests/xgettext-po-1
index 0784ad23b..60afc493d 100755
--- a/gettext-tools/tests/xgettext-po-1
+++ b/gettext-tools/tests/xgettext-po-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C, C++, PO extractors.
 
diff --git a/gettext-tools/tests/xgettext-properties-1 b/gettext-tools/tests/xgettext-properties-1
index 2d36a6042..5a11f8d70 100755
--- a/gettext-tools/tests/xgettext-properties-1
+++ b/gettext-tools/tests/xgettext-properties-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test C, C++, JavaProperties extractors.
 
diff --git a/gettext-tools/tests/xgettext-python-1 b/gettext-tools/tests/xgettext-python-1
index 227774c48..afa13da04 100755
--- a/gettext-tools/tests/xgettext-python-1
+++ b/gettext-tools/tests/xgettext-python-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Python support.
 
diff --git a/gettext-tools/tests/xgettext-python-2 b/gettext-tools/tests/xgettext-python-2
index 418c9a0de..340c16808 100755
--- a/gettext-tools/tests/xgettext-python-2
+++ b/gettext-tools/tests/xgettext-python-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Python support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-python-3 b/gettext-tools/tests/xgettext-python-3
index 2c4a5a7e3..34cc4adb0 100755
--- a/gettext-tools/tests/xgettext-python-3
+++ b/gettext-tools/tests/xgettext-python-3
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Python support: --from-code option and encoding recognition.
 
diff --git a/gettext-tools/tests/xgettext-python-4 b/gettext-tools/tests/xgettext-python-4
index 8b7e62632..3b62fd903 100755
--- a/gettext-tools/tests/xgettext-python-4
+++ b/gettext-tools/tests/xgettext-python-4
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Python support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-scheme-1 b/gettext-tools/tests/xgettext-scheme-1
index b5d5aa9d7..37bc58f01 100755
--- a/gettext-tools/tests/xgettext-scheme-1
+++ b/gettext-tools/tests/xgettext-scheme-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Scheme support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-scheme-2 b/gettext-tools/tests/xgettext-scheme-2
index e2916a84d..fcc366598 100755
--- a/gettext-tools/tests/xgettext-scheme-2
+++ b/gettext-tools/tests/xgettext-scheme-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Scheme support: strings outside any function call.
 
diff --git a/gettext-tools/tests/xgettext-scheme-3 b/gettext-tools/tests/xgettext-scheme-3
index b7c69856c..d653d2379 100755
--- a/gettext-tools/tests/xgettext-scheme-3
+++ b/gettext-tools/tests/xgettext-scheme-3
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Scheme support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-sh-1 b/gettext-tools/tests/xgettext-sh-1
index b40b509ec..b4e88be19 100755
--- a/gettext-tools/tests/xgettext-sh-1
+++ b/gettext-tools/tests/xgettext-sh-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Shell support.
 
diff --git a/gettext-tools/tests/xgettext-sh-2 b/gettext-tools/tests/xgettext-sh-2
index 849e13cb8..1965d7ea8 100755
--- a/gettext-tools/tests/xgettext-sh-2
+++ b/gettext-tools/tests/xgettext-sh-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Shell support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-sh-3 b/gettext-tools/tests/xgettext-sh-3
index 169185db1..b06589c42 100755
--- a/gettext-tools/tests/xgettext-sh-3
+++ b/gettext-tools/tests/xgettext-sh-3
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Shell support: backslashed double-quotes inside single-quotes.
 
diff --git a/gettext-tools/tests/xgettext-sh-4 b/gettext-tools/tests/xgettext-sh-4
index 8a3b22fd6..cc0a9a173 100755
--- a/gettext-tools/tests/xgettext-sh-4
+++ b/gettext-tools/tests/xgettext-sh-4
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Shell support: obsolete bash $"..." syntax.
 
diff --git a/gettext-tools/tests/xgettext-sh-5 b/gettext-tools/tests/xgettext-sh-5
index 609ec0e53..710ebabd0 100755
--- a/gettext-tools/tests/xgettext-sh-5
+++ b/gettext-tools/tests/xgettext-sh-5
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Shell support: bash $(...) syntax.
 
diff --git a/gettext-tools/tests/xgettext-sh-6 b/gettext-tools/tests/xgettext-sh-6
index 10842d44a..eac4ba1ae 100755
--- a/gettext-tools/tests/xgettext-sh-6
+++ b/gettext-tools/tests/xgettext-sh-6
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Shell support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-smalltalk-1 b/gettext-tools/tests/xgettext-smalltalk-1
index acbd9a577..2fd04a1f5 100755
--- a/gettext-tools/tests/xgettext-smalltalk-1
+++ b/gettext-tools/tests/xgettext-smalltalk-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Smalltalk support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-smalltalk-2 b/gettext-tools/tests/xgettext-smalltalk-2
index 5aa51b615..149bd172c 100755
--- a/gettext-tools/tests/xgettext-smalltalk-2
+++ b/gettext-tools/tests/xgettext-smalltalk-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Smalltalk support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-stringtable-1 b/gettext-tools/tests/xgettext-stringtable-1
index d1abf6579..b35253396 100755
--- a/gettext-tools/tests/xgettext-stringtable-1
+++ b/gettext-tools/tests/xgettext-stringtable-1
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test extractor of NeXTstep/GNUstep .strings files.
 
diff --git a/gettext-tools/tests/xgettext-tcl-1 b/gettext-tools/tests/xgettext-tcl-1
index 373729a44..a8331b293 100755
--- a/gettext-tools/tests/xgettext-tcl-1
+++ b/gettext-tools/tests/xgettext-tcl-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Tcl support.
 
diff --git a/gettext-tools/tests/xgettext-tcl-2 b/gettext-tools/tests/xgettext-tcl-2
index f04e07c0b..962cd9851 100755
--- a/gettext-tools/tests/xgettext-tcl-2
+++ b/gettext-tools/tests/xgettext-tcl-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Tcl support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-tcl-3 b/gettext-tools/tests/xgettext-tcl-3
index 04966b327..0f6ac08a6 100755
--- a/gettext-tools/tests/xgettext-tcl-3
+++ b/gettext-tools/tests/xgettext-tcl-3
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test Tcl support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-tcl-4 b/gettext-tools/tests/xgettext-tcl-4
index 7893ccbf4..31dd8e1a8 100644
--- a/gettext-tools/tests/xgettext-tcl-4
+++ b/gettext-tools/tests/xgettext-tcl-4
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Tcl support: escape sequences.
 
diff --git a/gettext-tools/tests/xgettext-vala-1 b/gettext-tools/tests/xgettext-vala-1
index 7c7e243b2..287d59a7a 100644
--- a/gettext-tools/tests/xgettext-vala-1
+++ b/gettext-tools/tests/xgettext-vala-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Vala support.
 
diff --git a/gettext-tools/tests/xgettext-ycp-1 b/gettext-tools/tests/xgettext-ycp-1
index ea7580591..bb00e2e86 100755
--- a/gettext-tools/tests/xgettext-ycp-1
+++ b/gettext-tools/tests/xgettext-ycp-1
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 #
 # Plural test for YCP
 #
diff --git a/gettext-tools/tests/xgettext-ycp-2 b/gettext-tools/tests/xgettext-ycp-2
index 7455d2d85..3c8555695 100755
--- a/gettext-tools/tests/xgettext-ycp-2
+++ b/gettext-tools/tests/xgettext-ycp-2
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test YCP support: --add-comments option.
 
diff --git a/gettext-tools/tests/xgettext-ycp-3 b/gettext-tools/tests/xgettext-ycp-3
index 75ca2ad0e..7c3716c25 100755
--- a/gettext-tools/tests/xgettext-ycp-3
+++ b/gettext-tools/tests/xgettext-ycp-3
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test YCP support: string literal concatenation.
 
diff --git a/gettext-tools/tests/xgettext-ycp-4 b/gettext-tools/tests/xgettext-ycp-4
index a05539470..75728e994 100755
--- a/gettext-tools/tests/xgettext-ycp-4
+++ b/gettext-tools/tests/xgettext-ycp-4
@@ -1,4 +1,5 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test YCP support: --add-comments option.