summaryrefslogtreecommitdiff
path: root/Master/install-tl
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2022-06-20 23:44:24 +0000
committerNorbert Preining <preining@logic.at>2022-06-20 23:44:24 +0000
commit3e67f8984bf6693843c6fe626b59969520e6191c (patch)
tree5588bee11dbe3f9af00337fce88dc4adc542bd7c /Master/install-tl
parentc824e751354f5900e585cb6ef2531ce819753f06 (diff)
install-tl: TEXMFLOCAL fixes
If --texdir is given, we should use it to set TEXMFLOCAL git-svn-id: svn://tug.org/texlive/trunk@63673 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl')
-rwxr-xr-xMaster/install-tl9
1 files changed, 7 insertions, 2 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 5f9d48f2f16..2b5c9e04f86 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -1784,8 +1784,13 @@ sub set_texlive_default_dirs {
set_standard_var('TEXMFSYSCONFIG', 'TEXLIVE_INSTALL_TEXMFSYSCONFIG',
'texmfsysconfig', "$vars{'TEXDIR'}/texmf-config");
#
+ # TEXMFLOCAL is special because the default in texmf.cnf
+ # TEXMFLOCAL = $SELFAUTOGRANDPARENT/texmf-local
+ # that is
+ # ..../texlive/texmf-local
+ #
set_standard_var('TEXMFLOCAL', 'TEXLIVE_INSTALL_TEXMFLOCAL',
- 'texmflocal', "$tex_prefix/texmf-local");
+ 'texmflocal', ($opt_texdir ? "$vars{'TEXDIR'}/texmf-local" :"$tex_prefix/texmf-local"));
#
set_standard_var('TEXMFHOME', 'TEXLIVE_INSTALL_TEXMFHOME',
'texmfhome', "$homedir/texmf");
@@ -3514,7 +3519,7 @@ the two groups are quite analogous.
+----------------+--------------------------------------+--------------+------------------+
| tree | default | group change | single change |
+----------------+--------------------------------------+--------------+------------------+
- | TEXMFLOCAL | /usr/local/texlive/YYYY/texmf-local | --texdir | --texmflocal |
+ | TEXMFLOCAL | /usr/local/texlive/texmf-local | --texdir | --texmflocal |
| TEXMFSYSVAR | /usr/local/texlive/YYYY/texmf-var | --texdir | --texmfsysvar |
| TEXMFSYSCONFIG | /usr/local/texlive/YYYY/texmf-config | --texdir | --texmfsysconfig |
+----------------+--------------------------------------+--------------+------------------+