diff options
author | Karl Berry <karl@freefriends.org> | 2013-04-04 22:54:34 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-04-04 22:54:34 +0000 |
commit | 241ddc21a97102d490f07f12638702a13d4a2e3a (patch) | |
tree | 4b58b989a0ca225a96f7b5b8115521e3f7890ba4 /Build | |
parent | cbc5d15025eacd6c76506330508257731ed94b35 (diff) |
texmf-dist instead of texmf for TEXMFCNF, too
git-svn-id: svn://tug.org/texlive/trunk@29643 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r-- | Build/source/texk/kpathsea/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/texmf.cnf | 17 |
2 files changed, 14 insertions, 8 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index d36014e9725..1e7189bcd31 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,8 @@ +2013-04-05 Karl Berry <karl@tug.org> + + * texmf.cnf (TEXMFCNF): likewise prepare to use texmf-dist instead + of texmf. + 2013-04-03 Karl Berry <karl@tug.org> * texmf.cnf (TEXMFMAIN): make it the same as $TEXMFDIST, diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf index 9c7712f87e4..2ac8f1d7f4b 100644 --- a/Build/source/texk/kpathsea/texmf.cnf +++ b/Build/source/texk/kpathsea/texmf.cnf @@ -454,7 +454,7 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// % argv[0], in kpse_set_program_name. % % This main texmf.cnf file is installed, for a release YYYY, in a -% directory such as /usr/local/texlive/YYYY/texmf/web2c/texmf.cnf. +% directory such as /usr/local/texlive/YYYY/texmf-dist/web2c/texmf.cnf. % 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 @@ -464,7 +464,7 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// % % 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 the subdirectories share/texmf-local and share/texmf-dist, % then ./texmf-local and ./texmf. % % However, we want to include one more directory: the @@ -480,15 +480,16 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// % TEXMFCNF = {\ $SELFAUTOLOC,\ -$SELFAUTOLOC/share/texmf-local/web2c,$SELFAUTOLOC/share/texmf/web2c,\ -$SELFAUTOLOC/texmf-local/web2c,$SELFAUTOLOC/texmf/web2c,\ +$SELFAUTOLOC/share/texmf-local/web2c,$SELFAUTOLOC/share/texmf-dist/web2c,\ +$SELFAUTOLOC/texmf-local/web2c,$SELFAUTOLOC/texmf-dist/web2c,\ $SELFAUTODIR,\ -$SELFAUTODIR/share/texmf-local/web2c,$SELFAUTODIR/share/texmf/web2c,\ -$SELFAUTODIR/texmf-local/web2c,$SELFAUTODIR/texmf/web2c,\ +$SELFAUTODIR/share/texmf-local/web2c,$SELFAUTODIR/share/texmf-dist/web2c,\ +$SELFAUTODIR/texmf-local/web2c,$SELFAUTODIR/texmf-dist/web2c,\ $SELFAUTOPARENT/../texmf-local/web2c,\ $SELFAUTOPARENT,\ -$SELFAUTOPARENT/share/texmf-local/web2c,$SELFAUTOPARENT/share/texmf/web2c,\ -$SELFAUTOPARENT/texmf-local/web2c,$SELFAUTOPARENT/texmf/web2c\ +$SELFAUTOPARENT/share/texmf-local/web2c,\ +$SELFAUTOPARENT/share/texmf-dist/web2c,\ +$SELFAUTOPARENT/texmf-local/web2c,$SELFAUTOPARENT/texmf-dist/web2c\ } % % For reference, here is the old brace-using definition: |