texlive[44223] trunk: TEXMFAUXTREES for tlmgr conf texmfauxtrees,
commits+karl at tug.org
commits+karl at tug.org
Sat May 6 18:23:44 CEST 2017
Revision: 44223
http://tug.org/svn/texlive?view=revision&revision=44223
Author: karl
Date: 2017-05-06 18:23:44 +0200 (Sat, 06 May 2017)
Log Message:
-----------
TEXMFAUXTREES for tlmgr conf texmfauxtrees, empty by default
Modified Paths:
--------------
trunk/Build/source/texk/kpathsea/ChangeLog
trunk/Build/source/texk/kpathsea/texmf.cnf
trunk/Master/texmf-dist/web2c/texmf.cnf
Modified: trunk/Build/source/texk/kpathsea/ChangeLog
===================================================================
--- trunk/Build/source/texk/kpathsea/ChangeLog 2017-05-06 11:22:29 UTC (rev 44222)
+++ trunk/Build/source/texk/kpathsea/ChangeLog 2017-05-06 16:23:44 UTC (rev 44223)
@@ -1,3 +1,9 @@
+2017-05-03 Karl Berry <karl at 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 at fuk.kindai.ac.jp>
* win32lib.c, mingw32.c: Update texlive_gs_init() (w32 only).
Modified: trunk/Build/source/texk/kpathsea/texmf.cnf
===================================================================
--- trunk/Build/source/texk/kpathsea/texmf.cnf 2017-05-06 11:22:29 UTC (rev 44222)
+++ trunk/Build/source/texk/kpathsea/texmf.cnf 2017-05-06 16:23:44 UTC (rev 44223)
@@ -84,17 +84,26 @@
% 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.
Modified: trunk/Master/texmf-dist/web2c/texmf.cnf
===================================================================
--- trunk/Master/texmf-dist/web2c/texmf.cnf 2017-05-06 11:22:29 UTC (rev 44222)
+++ trunk/Master/texmf-dist/web2c/texmf.cnf 2017-05-06 16:23:44 UTC (rev 44223)
@@ -84,17 +84,26 @@
% 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.
More information about the tex-live-commits
mailing list