diff options
| author | Karl Berry <karl@freefriends.org> | 2017-04-13 18:03:35 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2017-04-13 18:03:35 +0000 |
| commit | 4b81252d68493ff5051b8b8c8c9eba589380c326 (patch) | |
| tree | 3eb242f68dfb44b4a078de4055d4185ff45cba51 | |
| parent | 10afec2bf982256b64b6ced347ff4bf48b089e48 (diff) | |
try TEXMFLOCAL before TEXMFSYS*
git-svn-id: svn://tug.org/texlive/trunk@43776 c570f23f-e606-0410-a88d-b1316a301751
| -rw-r--r-- | Build/source/texk/kpathsea/ChangeLog | 7 | ||||
| -rw-r--r-- | Build/source/texk/kpathsea/texmf.cnf | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/web2c/texmf.cnf | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 8a18804cec0..c7882fbef91 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,10 @@ +2017-04-13 Karl Berry <karl@tug.org> + + * texmf.cnf (TEXMF, TEXMFDBS): move TEXMFLOCAL to before TEXMFSYS*, + so, e.g., config.ps in TEXMFLOCAL overrides TEXMFSYSCONFIG. + Report from Michael Shell: + http://tug.org/pipermail/tex-live/2016-July/039062.html + 2017-04-05 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * texmf.cnf: mendex requires the variable INDEXDICTIONARY. diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf index c7336bc17cc..635b0693fef 100644 --- a/Build/source/texk/kpathsea/texmf.cnf +++ b/Build/source/texk/kpathsea/texmf.cnf @@ -94,7 +94,7 @@ TEXMFCONFIG = ~/.texlive2017/texmf-config % should take precedence over distribution files -- although it is % generally a source of confusion to have different versions of a % package installed, whatever the trees, so try to avoid it. -TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST} +TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST} % Where to look for ls-R files. There need not be an ls-R in the % directories in this path, but if there is one, Kpathsea will use it. @@ -102,7 +102,7 @@ TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$T % does not create ls-R files in the non-!! elements -- because if an % ls-R is present, it will be used, and the disk will not be searched. % This is arguably a bug in kpathsea. -TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST} +TEXMFDBS = {!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST} % The system trees. These are the trees that are shared by all users. % If a tree appears in this list, the mktex* scripts will use diff --git a/Master/texmf-dist/web2c/texmf.cnf b/Master/texmf-dist/web2c/texmf.cnf index c7336bc17cc..635b0693fef 100644 --- a/Master/texmf-dist/web2c/texmf.cnf +++ b/Master/texmf-dist/web2c/texmf.cnf @@ -94,7 +94,7 @@ TEXMFCONFIG = ~/.texlive2017/texmf-config % should take precedence over distribution files -- although it is % generally a source of confusion to have different versions of a % package installed, whatever the trees, so try to avoid it. -TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST} +TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST} % Where to look for ls-R files. There need not be an ls-R in the % directories in this path, but if there is one, Kpathsea will use it. @@ -102,7 +102,7 @@ TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$T % does not create ls-R files in the non-!! elements -- because if an % ls-R is present, it will be used, and the disk will not be searched. % This is arguably a bug in kpathsea. -TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST} +TEXMFDBS = {!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST} % The system trees. These are the trees that are shared by all users. % If a tree appears in this list, the mktex* scripts will use |