diff options
| author | Karl Berry <karl@freefriends.org> | 2013-04-10 00:07:55 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2013-04-10 00:07:55 +0000 |
| commit | afac6d68c3b6235d66712dcffabb33c7f24aa9b8 (patch) | |
| tree | 2f279f917c1378de95e6eee5c8484eef6def53b6 /Master/texmf-dist/web2c | |
| parent | 90e59fd25a4752a5bd653890d763eaafb5f1a512 (diff) | |
(TEXMFCNF): restore looking in texmf/ for standalone ConTeXt and likely others
git-svn-id: svn://tug.org/texlive/trunk@29813 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/web2c')
| -rw-r--r-- | Master/texmf-dist/web2c/texmf.cnf | 39 |
1 files changed, 27 insertions, 12 deletions
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: |