(TEXMFCNF): include TLROOT/../texmf-local/web2c, following TL default layout

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

3 files changed, 45 insertions, 3 deletions

diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 779e65407a4..00c77cb8f4d 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-16  Karl Berry  <karl@tug.org>
+
+	* texmf.cnf (TEXMFCNF): spell out every directory explicitly,
+	so we can include $SELFAUTOPARENT/../texmf-local/web2c.
+
 2012-04-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* cnf.[ch]: Drop KPSEDLL from kpathsea_cnf_get(), and remove
diff --git a/Build/source/texk/kpathsea/NEWS b/Build/source/texk/kpathsea/NEWS
index 308325ec2df..7429a7e9a6b 100644
--- a/Build/source/texk/kpathsea/NEWS
+++ b/Build/source/texk/kpathsea/NEWS
@@ -1,6 +1,12 @@
 This file records noteworthy changes.  (Public domain.)
 
-6.0.1 (for TeX Collection 2011)
+6.1.0 (for TeX Collection 2012)
+* texmf.cnf is found in the great-grandparent's texmf-local,
+  corresponding to the default TeX Live installation.
+* New formats for .ris, .bltxml.
+* Merge with W32TeX.
+
+6.0.1 (for TeX Collection 2011, 5 July 2011)
 * Trailing comments and whitespace omitted from config values.
 * Add .tlu to type lua suffixes, and .dfont to truetype suffixes.
 * Prefix program_invocation{,_short}_name with kpse_.
diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf
index 4e638bc7b72..85cd273a345 100644
--- a/Build/source/texk/kpathsea/texmf.cnf
+++ b/Build/source/texk/kpathsea/texmf.cnf
@@ -49,6 +49,8 @@
 % (http://tug.org/tds), or files may not be found.
 %
 % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
+% Kpathsea sets SELFAUTOLOC (the directory with the binary),
+% SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent).
 TEXMFROOT = $SELFAUTOPARENT
 
 % The tree containing runtime files related to the specific
@@ -461,9 +463,38 @@ RUBYINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/ruby//
 % /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file
 % will take precedence over the distributed one under texmf/web2c.
 % 
-% For security reasons, it is better not to include . in this path.
+% For security reasons, it is best not to include . in this path.
 %
-TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
+% The idea behind this lengthy definition: for each of
+% SELFAUTO{LOC,DIR,AUTO}, look in the directory,
+% then the subdirectories share/texmf-local and share/texmf,
+% then ./texmf-local and ./texmf.
+% 
+% However, we want to include one more directory: the
+% great-grandparent's texmf-local, because that is how TL is installed
+% by default.  That is, given a binary
+% /usr/local/texlive/YYYY/bin/PLATFORM/kpsewhich, it should be fine
+% /usr/local/texlive/texmf-local/web2c/texmf.cnf.  Not under YYYY.
+% 
+% As a result, we cannot use actual brace expansion in the definition,
+% since we don't want to scatter ../'s throughout the value.  Hence we
+% explicitly list every directory.  Arguably more understandable anyway.
+%
+TEXMFCNF = {\
+$SELFAUTOLOC,\
+$SELFAUTOLOC/share/texmf-local/web2c,$SELFAUTOLOC/share/texmf/web2c,\
+$SELFAUTOLOC/texmf-local/web2c,$SELFAUTOLOC/texmf/web2c,\
+$SELFAUTODIR,\
+$SELFAUTODIR/share/texmf-local/web2c,$SELFAUTODIR/share/texmf/web2c,\
+$SELFAUTODIR/texmf-local/web2c,$SELFAUTODIR/texmf/web2c,\
+$SELFAUTOPARENT/../texmf-local/web2c,\
+$SELFAUTOPARENT,\
+$SELFAUTOPARENT/share/texmf-local/web2c,$SELFAUTOPARENT/share/texmf/web2c,\
+$SELFAUTOPARENT/texmf-local/web2c,$SELFAUTOPARENT/texmf/web2c\
+}
+%
+% For reference, here is the old brace-using definition:
+%TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
 
 % kpathsea 3.5.3 and later sets these at runtime. To avoid empty
 % expansions from binaries linked against an earlier version of the