19 files changed, 20 insertions, 19 deletions
diff --git a/Master/tlpkg/README b/Master/tlpkg/README
index 69454506810..4631c13c2e0 100644
--- a/Master/tlpkg/README
+++ b/Master/tlpkg/README
@@ -1,28 +1,29 @@
+Originally written by Norbert Preining, 2007.  Public domain.
 
-This directory contains the infrastructural files for TeX Live, including
+This directory contains infrastructure for TeX Live, including
 management programs and Perl modules.
 
-bin/
-	scripts for updating TeX Live's infrastructure files
+texlive.tlpdb	the database, updated automatically by karl@tug cron.
+texlive.pkgver	just package names and version numbers, also updated by cron,
+		so the network-capable installer can know what needs updating.
 
-doc/
-	Documentation of the infrastructure
+TeXLive/  the Perl library for TeX Live support; this is what the
+	infrastructure and installer use.
 
-lib/
-	shell stuff, currently only the work-in-progress shell library
-	for accessing the TeX Live Database
+bin/	maintenance scripts for TeX Live; nothing here should be 
+	needed by the installer or the user.
 
-TeXLive/
-	the perl modules
+doc/	documentation of the infrastructure.
 
-tlsrc/
-	tlsrc file for all packages in TeX Live
+etc/	archives, e.g., scripts used when switching to the new regime.
 
-README
-	this file
+installer/   the cross-platform Perl installer.
 
-etc/
-	stuff I used for creating/checking of the scripts, but not for
-	general perusal.
+lib/	TL library in other languages, none complete.
+
+man/	man pages (generated by pod2man).
+
+tlperl/	small Perl for TeX Live scripts, not installed for general use.
+
+tlpsrc/	tlpsrc files for all packages in TeX Live.
 
-np, 2007-06-16 
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index ef4827a87c4..58a324a2591 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -639,7 +639,7 @@ sub install_package {
 
   my @filelist = @$filelistref;
 
-  my $bindir  = "$::installerdir/tlpkg/bin";
+  my $bindir  = "$::installerdir/tlpkg/installer";
   # unix defaults
   my $wget    = "wget";
   my $lzmadec = "$bindir/lzmadec.$::_platform_";
diff --git a/Master/tlpkg/tests/tlpdb-install-test.pl b/Master/tlpkg/etc/tlpdb-install-test.pl
index 6a9a27fe1f2..6a9a27fe1f2 100755
--- a/Master/tlpkg/tests/tlpdb-install-test.pl
+++ b/Master/tlpkg/etc/tlpdb-install-test.pl
diff --git a/Master/tlpkg/bin/archive2.dll b/Master/tlpkg/installer/archive2.dll
index 1aaa96f9797..1aaa96f9797 100755
--- a/Master/tlpkg/bin/archive2.dll
+++ b/Master/tlpkg/installer/archive2.dll
diff --git a/Master/tlpkg/bin/bsdtar.exe b/Master/tlpkg/installer/bsdtar.exe
index f3c15f0eee1..f3c15f0eee1 100755
--- a/Master/tlpkg/bin/bsdtar.exe
+++ b/Master/tlpkg/installer/bsdtar.exe
diff --git a/Master/tlpkg/bin/bzip2.dll b/Master/tlpkg/installer/bzip2.dll
index f56dfac78ec..f56dfac78ec 100755
--- a/Master/tlpkg/bin/bzip2.dll
+++ b/Master/tlpkg/installer/bzip2.dll
diff --git a/Master/tlpkg/bin/generate-fmtutil b/Master/tlpkg/installer/generate-fmtutil
index c616ec9e330..c616ec9e330 100755
--- a/Master/tlpkg/bin/generate-fmtutil
+++ b/Master/tlpkg/installer/generate-fmtutil
diff --git a/Master/tlpkg/bin/generate-language b/Master/tlpkg/installer/generate-language
index dc82106aa69..dc82106aa69 100755
--- a/Master/tlpkg/bin/generate-language
+++ b/Master/tlpkg/installer/generate-language
diff --git a/Master/tlpkg/bin/generate-updmap b/Master/tlpkg/installer/generate-updmap
index bd4cca20038..bd4cca20038 100755
--- a/Master/tlpkg/bin/generate-updmap
+++ b/Master/tlpkg/installer/generate-updmap
diff --git a/Master/tlpkg/bin/lzmadec.i386-linux b/Master/tlpkg/installer/lzmadec.i386-linux
index 2f65a85340e..2f65a85340e 100755
--- a/Master/tlpkg/bin/lzmadec.i386-linux
+++ b/Master/tlpkg/installer/lzmadec.i386-linux
diff --git a/Master/tlpkg/bin/lzmadec.win32.exe b/Master/tlpkg/installer/lzmadec.win32.exe
index f91c8eb26b5..f91c8eb26b5 100755
--- a/Master/tlpkg/bin/lzmadec.win32.exe
+++ b/Master/tlpkg/installer/lzmadec.win32.exe
diff --git a/Master/tlpkg/bin/lzmadec.x86_64-linux b/Master/tlpkg/installer/lzmadec.x86_64-linux
index 884723f350c..884723f350c 100755
--- a/Master/tlpkg/bin/lzmadec.x86_64-linux
+++ b/Master/tlpkg/installer/lzmadec.x86_64-linux
diff --git a/Master/tlpkg/bin/msys-1.0.dll b/Master/tlpkg/installer/msys-1.0.dll
index 4d57f49676d..4d57f49676d 100755
--- a/Master/tlpkg/bin/msys-1.0.dll
+++ b/Master/tlpkg/installer/msys-1.0.dll
diff --git a/Master/tlpkg/bin/perl.exe b/Master/tlpkg/installer/perl.exe
index 30108d9a8cc..30108d9a8cc 100755
--- a/Master/tlpkg/bin/perl.exe
+++ b/Master/tlpkg/installer/perl.exe
diff --git a/Master/tlpkg/bin/perl58.dll b/Master/tlpkg/installer/perl58.dll
index d783261a862..d783261a862 100755
--- a/Master/tlpkg/bin/perl58.dll
+++ b/Master/tlpkg/installer/perl58.dll
diff --git a/Master/tlpkg/bin/uninstall-tl.bat b/Master/tlpkg/installer/uninstall-tl.bat
index ed18ef8010f..ed18ef8010f 100755
--- a/Master/tlpkg/bin/uninstall-tl.bat
+++ b/Master/tlpkg/installer/uninstall-tl.bat
diff --git a/Master/tlpkg/bin/uninstall-tl.pl b/Master/tlpkg/installer/uninstall-tl.pl
index de443cc76ae..de443cc76ae 100755
--- a/Master/tlpkg/bin/uninstall-tl.pl
+++ b/Master/tlpkg/installer/uninstall-tl.pl
diff --git a/Master/tlpkg/bin/wget.exe b/Master/tlpkg/installer/wget.exe
index ad974bfe5f8..ad974bfe5f8 100755
--- a/Master/tlpkg/bin/wget.exe
+++ b/Master/tlpkg/installer/wget.exe
diff --git a/Master/tlpkg/bin/zlib1.dll b/Master/tlpkg/installer/zlib1.dll
index 076f50336d9..076f50336d9 100755
--- a/Master/tlpkg/bin/zlib1.dll
+++ b/Master/tlpkg/installer/zlib1.dll