From 668f13d96ea148cade89c8813883c8b5a90cb55e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 1 Mar 2020 22:41:34 +0000 Subject: 2020 pretest setup (again) git-svn-id: svn://tug.org/texlive/trunk@53987 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/web2c/texmf.cnf | 8 ++++---- Master/texmf-dist/web2c/texmfcnf.lua | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/web2c/texmf.cnf b/Master/texmf-dist/web2c/texmf.cnf index 9de38920fd5..8ec2f429197 100644 --- a/Master/texmf-dist/web2c/texmf.cnf +++ b/Master/texmf-dist/web2c/texmf.cnf @@ -4,8 +4,8 @@ % If you modify this original file, YOUR CHANGES WILL BE LOST when it is % updated. Instead, put your changes -- and only your changes, not an % entire copy! -- in ../../texmf.cnf. That is, if this file is -% installed in /some/path/to/texlive/2019/texmf-dist/web2c/texmf.cnf, -% add your custom settings to /some/path/to/texlive/2019/texmf.cnf. +% installed in /some/path/to/texlive/2020/texmf-dist/web2c/texmf.cnf, +% add your custom settings to /some/path/to/texlive/2020/texmf.cnf. % (Below, we use YYYY in place of the specific year.) % % What follows is a super-summary of what this .cnf file can @@ -84,10 +84,10 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config TEXMFHOME = ~/texmf % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data. -TEXMFVAR = ~/.texlive2019/texmf-var +TEXMFVAR = ~/.texlive2020/texmf-var % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. -TEXMFCONFIG = ~/.texlive2019/texmf-config +TEXMFCONFIG = ~/.texlive2020/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 diff --git a/Master/texmf-dist/web2c/texmfcnf.lua b/Master/texmf-dist/web2c/texmfcnf.lua index 8ffe928a520..9382ffeb137 100644 --- a/Master/texmf-dist/web2c/texmfcnf.lua +++ b/Master/texmf-dist/web2c/texmfcnf.lua @@ -45,13 +45,13 @@ return { -- only used for FONTCONFIG_PATH & TEXMFCACHE in TeX Live TEXMFSYSVAR = "selfautoparent:texmf-var", - TEXMFVAR = "home:.texlive2019/texmf-var", + TEXMFVAR = "home:.texlive2020/texmf-var", -- We have only one cache path but there can be more. The first writable one -- will be chosen but there can be more readable paths. TEXMFCACHE = "$TEXMFSYSVAR;$TEXMFVAR", - TEXMFCONFIG = "home:.texlive2019/texmf-config", + TEXMFCONFIG = "home:.texlive2020/texmf-config", -- I don't like this texmf under home and texmf-home would make more -- sense. One never knows what installers put under texmf anywhere and -- cgit v1.2.3