diff options
| -rw-r--r-- | Build/source/texk/kpathsea/ChangeLog | 6 | ||||
| -rw-r--r-- | Build/source/texk/kpathsea/texmf.cnf | 13 | ||||
| -rw-r--r-- | Master/texmf-dist/web2c/texmf.cnf | 13 |
3 files changed, 28 insertions, 4 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index a9fe65a3808..38df80eef04 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,9 @@ +2017-05-03 Karl Berry <karl@tug.org> + + * texmf.cnf (TEXMFAUXTREES): new variable (default value empty + string via empty braces), for tlmgr conf auxtrees. + (TEXMF): include $TEXMFAUXTREES, but don't assume it is nonempty. + 2017-04-22 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * win32lib.c, mingw32.c: Update texlive_gs_init() (w32 only). diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf index e3bc93fdd71..a7ff623a8ca 100644 --- a/Build/source/texk/kpathsea/texmf.cnf +++ b/Build/source/texk/kpathsea/texmf.cnf @@ -84,17 +84,26 @@ TEXMFVAR = ~/.texlive2017/texmf-var % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. TEXMFCONFIG = ~/.texlive2017/texmf-config +% This is the value manipulated by tlmgr's auxtrees subcommand in the +% root texmf.cnf. Kpathsea warns about a literally empty string for a +% value, hence the empty braces. +TEXMFAUXTREES = {} + % List all the texmf trees. For an explanation of what they are, see the % TeX Live manual. % % For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named -% explicitly and before all other trees. +% explicitly and before other trees. % % TEXMFLOCAL precedes TEXMFDIST because locally-installed versions % 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,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST} +% +% The odd-looking $TEXMFAUXTREES$TEXMF... construct is so that if no auxtree is +% ever defined (the 99% common case), no extra elements will be added to +% the search paths. tlmgr takes care to end any value with a trailing comma. +TEXMF = {$TEXMFAUXTREES$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. diff --git a/Master/texmf-dist/web2c/texmf.cnf b/Master/texmf-dist/web2c/texmf.cnf index e3bc93fdd71..a7ff623a8ca 100644 --- a/Master/texmf-dist/web2c/texmf.cnf +++ b/Master/texmf-dist/web2c/texmf.cnf @@ -84,17 +84,26 @@ TEXMFVAR = ~/.texlive2017/texmf-var % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. TEXMFCONFIG = ~/.texlive2017/texmf-config +% This is the value manipulated by tlmgr's auxtrees subcommand in the +% root texmf.cnf. Kpathsea warns about a literally empty string for a +% value, hence the empty braces. +TEXMFAUXTREES = {} + % List all the texmf trees. For an explanation of what they are, see the % TeX Live manual. % % For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named -% explicitly and before all other trees. +% explicitly and before other trees. % % TEXMFLOCAL precedes TEXMFDIST because locally-installed versions % 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,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST} +% +% The odd-looking $TEXMFAUXTREES$TEXMF... construct is so that if no auxtree is +% ever defined (the 99% common case), no extra elements will be added to +% the search paths. tlmgr takes care to end any value with a trailing comma. +TEXMF = {$TEXMFAUXTREES$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. |