on win32 do: texmfhome = texmflocal, texmfvar = texmfsysvar,

texmfconfig = texmfsysconfig in texmf.cnf


git-svn-id: svn://tug.org/texlive/trunk@6155 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 23 insertions, 2 deletions

diff --git a/Master/install-tl.pl b/Master/install-tl.pl
index 024483347d9..c77c9b2f402 100755
--- a/Master/install-tl.pl
+++ b/Master/install-tl.pl
@@ -665,9 +665,30 @@ sub do_texmf_cnf {
       }
     } elsif ($line =~ m/^TEXMFHOME/) {
       if (win32()) {
-        warn "WARNING: TEXMFHOME is set to ~/texmf which will not work!\n";
+        # on Windows we set TEXMFHOME to TEXMFLOCAL until we know how to
+        # expand dynamically in kpse to getenv(PROFILEPATH)
+        push @newtmf, "TEXMFHOME = \$TEXMFLOCAL\n";
+      } else {
+        # on unix we ignore any setting done in the config dialog and leave
+        # TEXMFHOME as is, i.e., ~/texmf
+        push @newtmf, $line;
+      }
+    } elsif ($line =~ m/^TEXMFVAR/) {
+      if (win32()) {
+        # on Windows we set TEXMFVAR to TEXMFSYSVAR until we know how to
+        # expand dynamically in kpse to getenv(PROFILEPATH)
+        push @newtmf, "TEXMFVAR = \$TEXMFSYSVAR\n";
+      } else {
+        push @newtmf, $line;
+      }
+    } elsif ($line =~ m/^TEXMFCONFIG/) {
+      if (win32()) {
+        # on Windows we set TEXMFCONFIG to TEXMFSYSCONFIG until we know how to
+        # expand dynamically in kpse to getenv(PROFILEPATH)
+        push @newtmf, "TEXMFCONFIG = \$TEXMFSYSCONFIG\n";
+      } else {
+        push @newtmf, $line;
       }
-      push @newtmf, $line;
     } else {
       push @newtmf, $line;
     }