BIG change: no TLPDB->location anymore, but TLPDB->root

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

1 files changed, 5 insertions, 10 deletions

diff --git a/Master/install-tl.pl b/Master/install-tl.pl
index 35eb18cf89a..a6643eb7358 100755
--- a/Master/install-tl.pl
+++ b/Master/install-tl.pl
@@ -369,14 +369,14 @@ sub calc_depends {
 }
 
 sub load_tlpdb {
-  my $database;
+  my $master;
   if (media eq 'NET') {
-    $database="$::texlive_url/$TeXLive::TLConfig::InfraLocation/texlive.tlpdb";
+    $master="$::texlive_url";
   } else {
-    $database="$::installerdir/$TeXLive::TLConfig::InfraLocation/texlive.tlpdb";
+    $master="$::installerdir";
   }
-  print "Loading $database ...\n";
-  $tlpdb=TeXLive::TLPDB->new(location => "$database");
+  print "Loading $master ...\n";
+  $tlpdb=TeXLive::TLPDB->new(root => "$master");
 }
 
 sub initialize_collections {
@@ -482,15 +482,10 @@ sub read_profile {
 }
 
 sub prepare_installation {
-  my $infralocation="$TeXLive::TLConfig::InfraLocation";
-  my $localtlpdbfile="$vars{'TEXDIR'}/$infralocation/texlive.tlpdb";
-
-  mkdirhier "$vars{'TEXDIR'}/$infralocation";
   make_var_skeleton "$vars{'TEXMFSYSVAR'}";
   make_local_skeleton "$vars{'TEXMFLOCAL'}";
 
   $localtlpdb=new TeXLive::TLPDB;
-  $localtlpdb->location("$localtlpdbfile");
   $localtlpdb->root("$vars{'TEXDIR'}");
 }