From 3ae380353c1f49b6415003643ca4954026aad68f Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Mon, 20 Jun 2022 22:40:29 +0000
Subject: (set_texlive_default_dirs): default TEXMFLOCAL from $tex_prefix, not
 TEXDIR. Report from Vit,
 https://tug.org/pipermail/tex-live/2022-June/048228.html

git-svn-id: svn://tug.org/texlive/trunk@63670 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/install-tl | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'Master/install-tl')

diff --git a/Master/install-tl b/Master/install-tl
index f4653008a22..1dd6783f440 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -1176,12 +1176,12 @@ sub run_postinst_cmd {
 # 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 @@ sub do_texmf_cnf {
       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 @@ sub set_texlive_default_dirs {
   }
   # 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 @@ sub set_texlive_default_dirs {
                    '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");
-- 
cgit v1.2.3