Fix conflict between different uses of GETTEXTDATADIR.

* gettext-tools/src/read-tcl.c (msgdomain_read_tcl): Test GETTEXTTCLDIR, not
GETTEXTDATADIR.
* gettext-tools/tests/msgunfmt-tcl-1: Set GETTEXTTCLDIR, not GETTEXTDATADIR.

diff --git a/gettext-tools/src/read-tcl.c b/gettext-tools/src/read-tcl.c
index bcc3bd64cfbd0bef688868509a705474be19d8c3..5d13430969bca528246ed4580d980d9ed0005fb0 100644 (file)
--- a/gettext-tools/src/read-tcl.c
+++ b/gettext-tools/src/read-tcl.c
@@ -1,5 +1,5 @@
 /* Reading tcl/msgcat .msg files.
-   Copyright (C) 2002-2003, 2005-2008, 2011, 2015-2016 Free Software
+   Copyright (C) 2002-2003, 2005-2008, 2011, 2015-2016, 2018 Free Software
    Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
@@ -66,7 +66,7 @@ msgdomain_read_tcl (const char *locale_name, const char *directory)
 
   /* Make it possible to override the msgunfmt.tcl location.  This is
      necessary for running the testsuite before "make install".  */
-  gettextdatadir = getenv ("GETTEXTDATADIR");
+  gettextdatadir = getenv ("GETTEXTTCLDIR");
   if (gettextdatadir == NULL || gettextdatadir[0] == '\0')
     gettextdatadir = relocate (GETTEXTDATADIR);
 

diff --git a/gettext-tools/tests/msgunfmt-tcl-1 b/gettext-tools/tests/msgunfmt-tcl-1
index 6a2d2e06a0d996161f16654daf5d0b92ff0bd845..07facf9444da263bcf35242ddc43aa73069698fd 100755 (executable)
--- a/gettext-tools/tests/msgunfmt-tcl-1
+++ b/gettext-tools/tests/msgunfmt-tcl-1
@@ -42,7 +42,7 @@ test -d mu-tcl-1-msgs || mkdir mu-tcl-1-msgs
 ${MSGFMT} --tcl -d mu-tcl-1-msgs -l fr mu-tcl-1-fr.po || Exit 1
 
 : ${MSGUNFMT=msgunfmt}
-GETTEXTDATADIR="$abs_top_srcdir"/src \
+GETTEXTTCLDIR="$abs_top_srcdir"/src \
 ${MSGUNFMT} --tcl -d mu-tcl-1-msgs -l fr -o mu-tcl-1-prog.out || Exit 1
 
 cat <<\EOF > mu-tcl-1-prog.ok