leave texmf/web2c/texmf.cnf untouched, but created TEXDIR/texmf.cnf with

changed values


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

1 files changed, 12 insertions, 3 deletions

diff --git a/Master/install-tl b/Master/install-tl
index 739eada23d2..30c24766353 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -1054,6 +1054,7 @@ sub do_texmf_cnf {
   my @texmfcnflines = <TMF>;
   close(TMF);
   my @newtmf;
+  my @changedtmf;
   # we have to find TEXMFLOCAL TEXMFSYSVAR and TEXMFHOME
   foreach my $line (@texmfcnflines) {
     if ($line =~ m/^TEXMFLOCAL/) {
@@ -1065,6 +1066,7 @@ sub do_texmf_cnf {
         push @newtmf, $line;
       } else {
         push @newtmf, "TEXMFLOCAL = $vars{'TEXMFLOCAL'}\n";
+        push @changedtmf, "TEXMFLOCAL = $vars{'TEXMFLOCAL'}\n";
       }
     } elsif ($line =~ m/^TEXMFSYSVAR/) {
       # by default TEXMFSYSVAR = TEXDIR/texmf-var, if this is the case
@@ -1073,6 +1075,7 @@ sub do_texmf_cnf {
         push @newtmf, $line;
       } else {
         push @newtmf, "TEXMFSYSVAR = $vars{'TEXMFSYSVAR'}\n";
+        push @changedtmf, "TEXMFSYSVAR = $vars{'TEXMFSYSVAR'}\n";
       }
     } elsif ($line =~ m/^TEXMFSYSCONFIG/) {
       # by default TEXMFSYSCONFIG = TEXDIR/texmf-config, if this is the case
@@ -1081,14 +1084,19 @@ sub do_texmf_cnf {
         push @newtmf, $line;
       } else {
         push @newtmf, "TEXMFSYSCONFIG = $vars{'TEXMFSYSCONFIG'}\n";
+        push @changedtmf, "TEXMFSYSCONFIG = $vars{'TEXMFSYSCONFIG'}\n";
       }
     } elsif ($line =~ m/^TEXMFHOME/) {
       # kpse now expands ~ to USERPROFILE, so we don't treat win32 and
       # unix differently
       push @newtmf, "TEXMFHOME = $vars{'TEXMFHOME'}\n";
+      if ("$vars{'TEXMFHOME'}" ne "~/texmf") {
+        push @changedtmf, "TEXMFHOME = $vars{'TEXMFHOME'}\n";
+      }
     } elsif ($line =~ m/^OSFONTDIR/) {
       if (win32()) {
         push @newtmf, "OSFONTDIR = \$SystemRoot/fonts//\n";
+        push @changedtmf, "OSFONTDIR = \$SystemRoot/fonts//\n";
       } else {
         push @newtmf, $line;
       }
@@ -1097,13 +1105,14 @@ sub do_texmf_cnf {
     }
   }
   if (!$vars{'from_dvd'}) {
-    open(TMF,">$vars{'TEXDIR'}/texmf/web2c/texmf.cnf")
-        or die("Can't open $vars{'TEXDIR'}/texmf/web2c/texmf.cnf for writing: $!\n");
+    open(TMF,">$vars{'TEXDIR'}/texmf.cnf")
+        or die("Can't open $vars{'TEXDIR'}/texmf.cnf for writing: $!\n");
+    foreach (@changedtmf) { print TMF; }
   } else {
     open(TMF,">$vars{'TEXMFSYSVAR'}/web2c/texmf.cnf")
         or die("Can't open $vars{'TEXMFSYSVAR'}/web2c/texmf.cnf for writing: $!\n");
+    foreach (@newtmf) { print TMF; }
   }
-  foreach (@newtmf) { print TMF; }
   close(TMF);
 }