From d60b32ec021c0ee2615e52e864ee6285b6512ff5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 23 Feb 2024 16:44:23 +0000 Subject: 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 --- Build/source/texk/kpathsea/ChangeLog | 6 ++++++ Build/source/texk/kpathsea/texmf.cnf | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'Build/source/texk/kpathsea') 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 + + * 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 * 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// -- cgit v1.2.3