Adapt the 'common' module to the new TL setting.

git-svn-id: svn://tug.org/texlive/trunk@49758 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 11 insertions, 11 deletions

diff --git a/Build/source/texk/web2c/cwebboot.cin b/Build/source/texk/web2c/cwebboot.cin
index 2ab2b229837..3b740b1af1d 100644
--- a/Build/source/texk/web2c/cwebboot.cin
+++ b/Build/source/texk/web2c/cwebboot.cin
@@ -179,7 +179,7 @@ err_print(_("! Include file name too long") ) ;goto restart;} \
 
 #define _(STRING) gettext(STRING)  \
 
-#define TEXMF_LOCALE "$TEXMFLOCALEFILES" \
+#define TEXMF_LOCALE "$TEXMFLOCALEDIR" \
 
 #define kpse_find_cweb(name) kpse_find_file(name,kpse_cweb_format,true)  \
 
diff --git a/Build/source/texk/web2c/cwebdir/comm-w2c.ch b/Build/source/texk/web2c/cwebdir/comm-w2c.ch
index 9bba9ba0161..cd326dd485c 100644
--- a/Build/source/texk/web2c/cwebdir/comm-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/comm-w2c.ch
@@ -1250,21 +1250,21 @@ place in the file system.
 
 Plans for \TeX~Live are to store NLS catalogs inside the ``\TeX\ Directory
 Structure'' (TDS) and look them up with the help of the configuration variable
-``|TEXMFLOCALEFILES|'' (subject to change in the final setup).  Below we use
-the \Kpathsea/ function |kpse_var_expand| to evaluate this variable from
-various origins and redirect the ``GNU~gettext utilities'' to a possibly
-different location than the canonical \.{/usr/share/locale}.
+``|TEXMFLOCALEDIR|,'' which should contain a single absolute path definition.
+Below we use the \Kpathsea/ function |kpse_var_expand| to evaluate this
+variable from various origins and redirect the ``GNU~gettext utilities''
+to a possibly different location than the canonical \.{/usr/share/locale}.
 
-There are several ways to set |TEXMFLOCALEFILES|:
+There are several ways to set |TEXMFLOCALEDIR|:
 \smallskip
 {\parindent5em
-\item{(a)} a user-set environment variable \.{TEXMFLOCALEFILES}\hfil\break
-    (overridden by \.{TEXMFLOCALEFILES\_cweb});
+\item{(a)} a user-set environment variable \.{TEXMFLOCALEDIR}\hfil\break
+    (overridden by \.{TEXMFLOCALEDIR\_cweb});
 \item{(b)} a line in \Kpathsea/ configuration file \.{texmf.cnf},\hfil\break
-    e.g., \.{TEXMFLOCALEFILES=\$TEXMFDIST/locale}\hfil\break
-    or \.{TEXMFLOCALEFILES.cweb=\$TEXMFDIST/locale}.\par}
+    e.g., \.{TEXMFLOCALEDIR=\$TEXMFMAIN/locale}\hfil\break
+    or \.{TEXMFLOCALEDIR.cweb=\$TEXMFMAIN/locale}.\par}
 
-@d TEXMF_LOCALE "$TEXMFLOCALEFILES"
+@d TEXMF_LOCALE "$TEXMFLOCALEDIR"
 
 @<Set locale...@>=
 setlocale(LC_MESSAGES, setlocale(LC_CTYPE, ""));