use C:\texlive\YYYY as default installation location for win32

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

1 files changed, 2 insertions, 7 deletions

diff --git a/Master/install-tl b/Master/install-tl
index 5aef80d493c..2b2a8833ae8 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -575,7 +575,6 @@ exit(0);
 
 sub do_installation {
   if (win32()) {
-    debug("Switching to non-admin mode due to explicit user request!\n");
     non_admin() if !$vars{'option_w32_multi_user'};
   }
   if ($vars{'n_collections_selected'} <= 0) {
@@ -993,12 +992,8 @@ sub set_texlive_default_dirs {
 
   $tex_prefix=getenv('TEXLIVE_INSTALL_PREFIX');
   if (win32) {
-    my $prog = getenv('ProgramFiles');
-    $tex_prefix ||= $prog . '/texlive';
-    if (!TeXLive::TLUtils::texdir_check("$tex_prefix/$texlive_release")) {
-      # the default location is not writable, switch to C:\texlive
-      $tex_prefix = "c:/texlive";
-    }
+    $tex_prefix ||= getenv('SystemDrive') . '/texlive';
+    # we use SystemDrive because ProgramFiles requires admin rights
     # we don't use USERPROFILE here because that will be copied back and
     # forth on roaming profiles
   } else {