* install-tl, install-menu-text.pl: support changing TEXMFVAR and

TEXMFCONFIG, write in profile, etc.
mkdirhier TEXMFVAR before running luatools --generate.
* tl-update-tlnet: message change.
* texmfcnf.lua: doc changes.


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

1 files changed, 23 insertions, 4 deletions

diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index f3099d1b1a7..6e3e0411a87 100755
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -2,8 +2,8 @@
 # $Id$
 # install-menu-txt.pl
 #
+# Copyright 2007, 2008, 2009, 2010 Norbert Preining, Karl Berry
 # Copyright 2007, 2008 Reinhard Kotucha
-# Copyright 2007, 2008, 2009 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 #
@@ -480,7 +480,9 @@ EOF
  <3> TEXMFSYSVAR:    $vars{'TEXMFSYSVAR'}
  <4> TEXMFSYSCONFIG: $vars{'TEXMFSYSCONFIG'}
 
- <5> TEXMFHOME:      $vars{'TEXMFHOME'}
+ <5> TEXMFVAR:       $vars{'TEXMFVAR'}
+ <6> TEXMFCONFIG:    $vars{'TEXMFCONFIG'}
+ <7> TEXMFHOME:      $vars{'TEXMFHOME'}
 
 EOF
 
@@ -528,8 +530,20 @@ EOF
     return $command{'self'};
 
   } elsif ("\u$answer" eq '5') {
+    print "New value for TEXMFVAR [$vars{'TEXMFVAR'}]: ";
+    $answer = &input_dirname ("noexpansion");
+    $vars{'TEXMFVAR'} = $answer if $answer ne "";
+    return $command{'self'};
+
+  } elsif ("\u$answer" eq '6') {
+    print "New value for TEXMFCONFIG [$vars{'TEXMFCONFIG'}]: ";
+    $answer = &input_dirname ("noexpansion");
+    $vars{'TEXMFCONFIG'} = $answer if $answer ne "";
+    return $command{'self'};
+
+  } elsif ("\u$answer" eq '7') {
     print "New value for TEXMFHOME [$vars{'TEXMFHOME'}]: ";
-    $answer = &input_dirname (1);
+    $answer = &input_dirname ("noexpansion");
     $vars{'TEXMFHOME'} = $answer if $answer ne "";
     return $command{'self'};
   }
@@ -544,6 +558,7 @@ EOF
 
 
 # Helper function to read a directory name and clean it up.
+# Unless NO_EXPANSION is true, convert to absolute path.
 # 
 sub input_dirname
 {
@@ -947,7 +962,7 @@ EOF
 
     if (!check_on_lang_collection_installed()) {
       print "     !! No language specific collection selected!\n";
-      print "     !! If you only write English documents that is fine!\n";
+      print "     !! If you only write American English documents that is fine!\n";
     }
 
     print <<"EOF";
@@ -975,6 +990,10 @@ EOF
      $vars{'TEXMFSYSVAR'}
    TEXMFSYSCONFIG (directory for local config):
      $vars{'TEXMFSYSCONFIG'}
+   TEXMFVAR (personal directory for variable and automatically generated data):
+     $vars{'TEXMFVAR'}
+   TEXMFCONFIG (personal directory for local config):
+     $vars{'TEXMFCONFIG'}
    TEXMFHOME (directory for user-specific files):
      $vars{'TEXMFHOME'}