move the lzma* binaries to tlpkg/installer/lzma and adjust the tlpsrc and

TLUtils.pm


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

1 files changed, 5 insertions, 5 deletions

diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 8e65670ea37..5b09bfd6c5f 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -771,14 +771,14 @@ sub setup_programs {
     $::installerdir = "$bindir/../..";
     $platform = platform();
   }
-  $::progs{'lzmadec'} = "$bindir/lzmadec.$platform";
-  $::progs{'lzma'} = "$bindir/lzma.$platform";
+  $::progs{'lzmadec'} = "$bindir/lzma/lzmadec.$platform";
+  $::progs{'lzma'} = "$bindir/lzma/lzma.$platform";
   $::progs{'tar'} = "tar";
   if (win32()) {
     $::progs{'wget'}    = conv_to_win_path("$bindir/wget.exe");
     $::progs{'tar'}     = conv_to_win_path("$bindir/tar.exe");
-    $::progs{'lzmadec'} = conv_to_win_path("$bindir/lzmadec.win32.exe");
-    $::progs{'lzma'}    = conv_to_win_path("$bindir/lzma.exe");
+    $::progs{'lzmadec'} = conv_to_win_path("$bindir/lzma/lzmadec.win32.exe");
+    $::progs{'lzma'}    = conv_to_win_path("$bindir/lzma/lzma.exe");
   }
 }
 
@@ -891,7 +891,7 @@ sub install_package_old {
   my $tar="/bin/tar -xf - -C";
   my $wget="wget -nv -O-";
   if (win32) {
-    $lzmadec="$bindir/lzma.exe -si -so";
+    $lzmadec="$bindir/lzma/lzma.exe -si -so";
     $tar="$bindir/tar.exe -xf - -C";
     $wget="$bindir/wget.exe -nv -O-";
   }