diff options
| -rw-r--r-- | Build/source/texk/kpathsea/ChangeLog | 6 | ||||
| -rw-r--r-- | Build/source/texk/kpathsea/texmf.cnf | 39 | ||||
| -rw-r--r-- | Master/texmf-dist/web2c/texmf.cnf | 39 |
3 files changed, 60 insertions, 24 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 03f1266b91e..3a8cf51e7b7 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,9 @@ +2013-04-10 Karl Berry <karl@tug.org> + + * texmf.cnf (TEXMFCNF): still look in texmf/ subdirs after all; + needed for non-TL context and likely others. Report from + Mojca/Hans. + 2013-04-05 Karl Berry <karl@tug.org> * other files: 2013 in copyright year list. diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf index 2ac8f1d7f4b..53173a168d4 100644 --- a/Build/source/texk/kpathsea/texmf.cnf +++ b/Build/source/texk/kpathsea/texmf.cnf @@ -458,16 +458,18 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// % Since this file is subject to future updates, the TeX Live installer % or human administrator may also create a file % /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file -% will take precedence over the distributed one under texmf/web2c. +% will take precedence over the distributed one. % % For security reasons, it is best not to include . in this path. % % 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-dist, -% then ./texmf-local and ./texmf. +% SELFAUTO{LOC,DIR,PARENT}, look in the directory, +% then the subdirectories share/texmf-local, share/texmf-dist, share/texmf, +% then the subdirectories ./texmf-local, texmf-dist, ./texmf. +% At any given installation, most of these directories will not exist, +% but they all turn out to be useful somewhere. % -% However, we want to include one more directory: the +% Special addition -- 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 find @@ -475,21 +477,34 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// % % 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 this -% way anyway. +% explicitly list every directory. Arguably more understandable anyway. % TEXMFCNF = {\ $SELFAUTOLOC,\ -$SELFAUTOLOC/share/texmf-local/web2c,$SELFAUTOLOC/share/texmf-dist/web2c,\ -$SELFAUTOLOC/texmf-local/web2c,$SELFAUTOLOC/texmf-dist/web2c,\ +$SELFAUTOLOC/share/texmf-local/web2c,\ +$SELFAUTOLOC/share/texmf-dist/web2c,\ +$SELFAUTOLOC/share/texmf/web2c,\ +$SELFAUTOLOC/texmf-local/web2c,\ +$SELFAUTOLOC/texmf-dist/web2c,\ +$SELFAUTOLOC/texmf/web2c,\ +\ $SELFAUTODIR,\ -$SELFAUTODIR/share/texmf-local/web2c,$SELFAUTODIR/share/texmf-dist/web2c,\ -$SELFAUTODIR/texmf-local/web2c,$SELFAUTODIR/texmf-dist/web2c,\ +$SELFAUTODIR/share/texmf-local/web2c,\ +$SELFAUTODIR/share/texmf-dist/web2c,\ +$SELFAUTODIR/share/texmf/web2c,\ +$SELFAUTODIR/texmf-local/web2c,\ +$SELFAUTODIR/texmf-dist/web2c,\ +$SELFAUTODIR/texmf/web2c,\ +\ $SELFAUTOPARENT/../texmf-local/web2c,\ $SELFAUTOPARENT,\ +\ $SELFAUTOPARENT/share/texmf-local/web2c,\ $SELFAUTOPARENT/share/texmf-dist/web2c,\ -$SELFAUTOPARENT/texmf-local/web2c,$SELFAUTOPARENT/texmf-dist/web2c\ +$SELFAUTOPARENT/share/texmf/web2c,\ +$SELFAUTOPARENT/texmf-local/web2c,\ +$SELFAUTOPARENT/texmf-dist/web2c,\ +$SELFAUTOPARENT/texmf/web2c\ } % % For reference, here is the old brace-using definition: diff --git a/Master/texmf-dist/web2c/texmf.cnf b/Master/texmf-dist/web2c/texmf.cnf index 2ac8f1d7f4b..53173a168d4 100644 --- a/Master/texmf-dist/web2c/texmf.cnf +++ b/Master/texmf-dist/web2c/texmf.cnf @@ -458,16 +458,18 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// % Since this file is subject to future updates, the TeX Live installer % or human administrator may also create a file % /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file -% will take precedence over the distributed one under texmf/web2c. +% will take precedence over the distributed one. % % For security reasons, it is best not to include . in this path. % % 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-dist, -% then ./texmf-local and ./texmf. +% SELFAUTO{LOC,DIR,PARENT}, look in the directory, +% then the subdirectories share/texmf-local, share/texmf-dist, share/texmf, +% then the subdirectories ./texmf-local, texmf-dist, ./texmf. +% At any given installation, most of these directories will not exist, +% but they all turn out to be useful somewhere. % -% However, we want to include one more directory: the +% Special addition -- 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 find @@ -475,21 +477,34 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// % % 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 this -% way anyway. +% explicitly list every directory. Arguably more understandable anyway. % TEXMFCNF = {\ $SELFAUTOLOC,\ -$SELFAUTOLOC/share/texmf-local/web2c,$SELFAUTOLOC/share/texmf-dist/web2c,\ -$SELFAUTOLOC/texmf-local/web2c,$SELFAUTOLOC/texmf-dist/web2c,\ +$SELFAUTOLOC/share/texmf-local/web2c,\ +$SELFAUTOLOC/share/texmf-dist/web2c,\ +$SELFAUTOLOC/share/texmf/web2c,\ +$SELFAUTOLOC/texmf-local/web2c,\ +$SELFAUTOLOC/texmf-dist/web2c,\ +$SELFAUTOLOC/texmf/web2c,\ +\ $SELFAUTODIR,\ -$SELFAUTODIR/share/texmf-local/web2c,$SELFAUTODIR/share/texmf-dist/web2c,\ -$SELFAUTODIR/texmf-local/web2c,$SELFAUTODIR/texmf-dist/web2c,\ +$SELFAUTODIR/share/texmf-local/web2c,\ +$SELFAUTODIR/share/texmf-dist/web2c,\ +$SELFAUTODIR/share/texmf/web2c,\ +$SELFAUTODIR/texmf-local/web2c,\ +$SELFAUTODIR/texmf-dist/web2c,\ +$SELFAUTODIR/texmf/web2c,\ +\ $SELFAUTOPARENT/../texmf-local/web2c,\ $SELFAUTOPARENT,\ +\ $SELFAUTOPARENT/share/texmf-local/web2c,\ $SELFAUTOPARENT/share/texmf-dist/web2c,\ -$SELFAUTOPARENT/texmf-local/web2c,$SELFAUTOPARENT/texmf-dist/web2c\ +$SELFAUTOPARENT/share/texmf/web2c,\ +$SELFAUTOPARENT/texmf-local/web2c,\ +$SELFAUTOPARENT/texmf-dist/web2c,\ +$SELFAUTOPARENT/texmf/web2c\ } % % For reference, here is the old brace-using definition: |