[subversion-commit] SVN tetex commit + diffs: r357 - tex-common/trunk/conf/texmf.d

[Norbert Preining]

Author: preining-guest
Date: 2005-11-25 12:49:29 +0000 (Fri, 25 Nov 2005)
New Revision: 357

Modified:
   tex-common/trunk/conf/texmf.d/05TeXMF.cnf
Log:
add TEXMFDIST to TEXMF, add TEXMFHOME to TEXMFDBS, add comment to TEXMFDIST


Modified: tex-common/trunk/conf/texmf.d/05TeXMF.cnf
===================================================================
--- tex-common/trunk/conf/texmf.d/05TeXMF.cnf	2005-11-25 12:19:13 UTC (rev 356)
+++ tex-common/trunk/conf/texmf.d/05TeXMF.cnf	2005-11-25 12:49:29 UTC (rev 357)
@@ -60,8 +60,10 @@
 
 % The main distribution tree:
 % TEXMFDIST = /usr/share/texmf-dist
-% TEXMFDIST is used for tetex and texlive
-TEXMFDIST = /usr/share/texmf-{tetex;texlive}
+% TEXMFDIST is used for tetex and texlive. If both are installed,
+% the first in the list wins; files only present in the second directory
+% are also found.
+TEXMFDIST = /usr/share/texmf-{tetex,texlive}
 
 
 % A place for local additions to a "standard" texmf tree.
@@ -116,7 +118,7 @@
 %
 % For texconfig to work properly, TEXMFCONGIG and TEXMFVAR should be named
 % explicitly and before all other trees.
-TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFMAIN}
+TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFMAIN,!!$TEXMFDIST}
 
 % The system trees.  These are the trees that are shared by all the users.
 SYSTEXMF = $TEXMFLOCAL;$TEXMFMAIN;$TEXMFDIST
@@ -133,7 +135,7 @@
 % one of the TEXMF directories (avoids overlapping ls-R files).
 %
 % TEXMFDBS = $TEXMF;$VARTEXFONTS
-TEXMFDBS = $TEXMFSYSVAR;$TEXMFLOCAL;$TEXMFMAIN;$VARTEXFONTS;$TEXMFDIST
+TEXMFDBS = $TEXMFHOME;$TEXMFSYSVAR;$TEXMFLOCAL;$TEXMFMAIN;$VARTEXFONTS;$TEXMFDIST
 
 % It may be convenient to define TEXMF like this:
 %   TEXMF = {$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFMAIN,$HOME}