summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-02-23 16:44:23 +0000
committerKarl Berry <karl@freefriends.org>2024-02-23 16:44:23 +0000
commitd60b32ec021c0ee2615e52e864ee6285b6512ff5 (patch)
tree4fed1aa4c1009bfa42d819623b8cc228b55df406 /Build/source/texk
parent0bbec338ca5052207d77885687820bc6d19d73c2 (diff)
use our own XE_* variables instead of system FONTCONFIG_PATH and FC_CACHEDIR
git-svn-id: svn://tug.org/texlive/trunk@70088 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog6
-rw-r--r--Build/source/texk/kpathsea/texmf.cnf8
2 files changed, 10 insertions, 4 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 452890b9efa..3bdb457c7bf 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,9 @@
+2024-02-23 Karl Berry <karl@freefriends.org>
+
+ * texmf.cnf (XE_FONTCONFIG_PATH, XE_FC_CACHEDIR): rename from
+ FONTCONFIG_PATH resp. FC_CACHEDIR so we don't collide with
+ system directories specified by those paths, such as /etc/fonts.
+
2024-02-22 Karl Berry <karl@freefriends.org>
* tests/kpsereadlink.test: create and use our own test file and
diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf
index 83faca77dae..4cb01e45b15 100644
--- a/Build/source/texk/kpathsea/texmf.cnf
+++ b/Build/source/texk/kpathsea/texmf.cnf
@@ -455,12 +455,12 @@ MIMELIBDIR = $TEXMFROOT/etc
MAILCAPLIBDIR = $TEXMFROOT/etc
% Default settings for the fontconfig library as used by the Windows
-% versions of xetex/xdvipdfmx. Not used by xetex on Unixish systems.
-% ConTeXT MkIV (all platforms) also use these values.
+% versions of xetex/xdvipdfmx. Not used by xetex itself on Unixish systems,
+% but the postaction for xetex uses all of these on all systems.
%
FONTCONFIG_FILE = fonts.conf
-FONTCONFIG_PATH = $TEXMFSYSVAR/fonts/conf
-FC_CACHEDIR = $TEXMFSYSVAR/fonts/cache
+XE_FONTCONFIG_PATH = $TEXMFSYSVAR/fonts/conf
+XE_FC_CACHEDIR = $TEXMFSYSVAR/fonts/cache
% TeX documentation and source files, for use with texdoc and kpsewhich.
TEXDOCS = $TEXMF/doc//