texlive[63670] Master/install-tl: (set_texlive_default_dirs): default

[commits+karl at tug.org]

Revision: 63670
          http://tug.org/svn/texlive?view=revision&revision=63670
Author:   karl
Date:     2022-06-21 00:40:29 +0200 (Tue, 21 Jun 2022)
Log Message:
-----------
(set_texlive_default_dirs): default TEXMFLOCAL
from $tex_prefix, not TEXDIR. Report from Vit,
https://tug.org/pipermail/tex-live/2022-June/048228.html

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

Modified: trunk/Master/install-tl
===================================================================
--- trunk/Master/install-tl	2022-06-20 21:46:09 UTC (rev 63669)
+++ trunk/Master/install-tl	2022-06-20 22:40:29 UTC (rev 63670)
@@ -1176,12 +1176,12 @@
 # and more.  Return count of errors detected, hopefully zero.
 #
 sub do_postinst_stuff {
-  my $TEXDIR = "$vars{'TEXDIR'}";
-  my $TEXMFSYSVAR = "$vars{'TEXMFSYSVAR'}";
-  my $TEXMFSYSCONFIG = "$vars{'TEXMFSYSCONFIG'}";
-  my $TEXMFVAR = "$vars{'TEXMFVAR'}";
-  my $TEXMFCONFIG = "$vars{'TEXMFCONFIG'}";
-  my $TEXMFLOCAL = "$vars{'TEXMFLOCAL'}";
+  my $TEXDIR = $vars{'TEXDIR'};
+  my $TEXMFSYSVAR = $vars{'TEXMFSYSVAR'};
+  my $TEXMFSYSCONFIG = $vars{'TEXMFSYSCONFIG'};
+  my $TEXMFVAR = $vars{'TEXMFVAR'};
+  my $TEXMFCONFIG = $vars{'TEXMFCONFIG'};
+  my $TEXMFLOCAL = $vars{'TEXMFLOCAL'};
   my $tmv;
 
   do_texmf_cnf();
@@ -1494,6 +1494,7 @@
       my $deftmflocal = Cwd::abs_path($vars{'TEXDIR'}.'/../texmf-local');
       if (!defined $deftmflocal       # in case abs_path couldn't resolve
           || Cwd::abs_path($vars{TEXMFLOCAL}) ne "$deftmflocal") {
+        warn "TEXMFLOCAL changed, now $vars{'TEXMFLOCAL'}\n";
         push @changedtmf, "TEXMFLOCAL = $vars{'TEXMFLOCAL'}\n";
       }
     } elsif ($line =~ m/^TEXMFSYSVAR/) {
@@ -1767,15 +1768,17 @@
   }
   # first set $tex_prefix
   my $tex_prefix;
-  set_var_from_alternatives( "TEX_PREFIX", \$tex_prefix,
+  set_var_from_alternatives("TEX_PREFIX", \$tex_prefix,
     ($opt_in_place ? abs_path($::installerdir) : undef),
     $tlprefixenv,
     (win32() ? getenv('SystemDrive') . '/texlive' : '/usr/local/texlive'));
-  set_var_from_alternatives( "TEXDIR", \$vars{'TEXDIR'},
+  #
+  set_var_from_alternatives("TEXDIR", \$vars{'TEXDIR'},
     $opt_texdir,
     $vars{'TEXDIR'},
     ($vars{'instopt_portable'} || $opt_in_place)
       ? $tex_prefix : "$tex_prefix/$texlive_release");
+  #
   set_standard_var('TEXMFSYSVAR', 'TEXLIVE_INSTALL_TEXMFSYSVAR',
                    'texmfsysvar', "$vars{'TEXDIR'}/texmf-var");
   #
@@ -1783,7 +1786,7 @@
                    'texmfsysconfig', "$vars{'TEXDIR'}/texmf-config");
   #
   set_standard_var('TEXMFLOCAL', 'TEXLIVE_INSTALL_TEXMFLOCAL',
-                   'texmflocal', "$vars{'TEXDIR'}/texmf-local");
+                   'texmflocal', "$tex_prefix/texmf-local");
   #
   set_standard_var('TEXMFHOME', 'TEXLIVE_INSTALL_TEXMFHOME',
                    'texmfhome', "$homedir/texmf");