texlive[63673] Master/install-tl: install-tl: TEXMFLOCAL fixes

[commits+preining at tug.org]

Revision: 63673
          http://tug.org/svn/texlive?view=revision&revision=63673
Author:   preining
Date:     2022-06-21 01:44:24 +0200 (Tue, 21 Jun 2022)
Log Message:
-----------
install-tl: TEXMFLOCAL fixes

If --texdir is given, we should use it to set TEXMFLOCAL

Modified Paths:
--------------
    trunk/Master/install-tl

Modified: trunk/Master/install-tl
===================================================================
--- trunk/Master/install-tl	2022-06-20 23:42:46 UTC (rev 63672)
+++ trunk/Master/install-tl	2022-06-20 23:44:24 UTC (rev 63673)
@@ -1784,8 +1784,13 @@
   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 @@
   +----------------+--------------------------------------+--------------+------------------+
   |    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 |
   +----------------+--------------------------------------+--------------+------------------+