3 files changed, 10 insertions, 82 deletions
diff --git a/Master/install-tl.bat b/Master/install-tl.bat
deleted file mode 100755
index ccffcefcaab..00000000000
--- a/Master/install-tl.bat
+++ /dev/null
@@ -1,80 +0,0 @@
-@echo off
-rem $Id$
-rem Wrapper script to set up environment for installer
-rem
-rem Public domain.
-rem Originally written 2009 by Tomasz M. Trzeciak.
-
-rem First, check if this is DOS based system
-rem in DOS '^' is just a normal character
-if not ^x==x goto DOS
-
-rem Localize environment changes
-setlocal enableextensions
-
-rem Batch subroutines require a cd to the batchfile directory.
-rem For UNC paths, pushd will create a temporary mapping.
-pushd "%~dp0"
-
-rem Remove any double quotes from PATH (why we care for it at all???)
-set "path=%path:"=%"
-
-rem Break search path into dir list and rebuild w/o tex dirs
-call :rebuildpath ";" "%path:;=" "%"
-if "%path:~0,1%"==";" set "path=%path:~1%"
-
-rem Use TL Perl
-set "path=%~dp0tlpkg\tlperl\bin;%path%"
-set "PERL5LIB=%~dp0tlpkg\tlperl\lib"
-
-rem Clean environment from other Perl variables
-set PERL5OPT=
-set PERLIO=
-set PERLIO_DEBUG=
-set PERLLIB=
-set PERL5DB=
-set PERL5DB_THREADED=
-set PERL5SHELL=
-set PERL_ALLOW_NON_IFS_LSP=
-set PERL_DEBUG_MSTATS=
-set PERL_DESTRUCT_LEVEL=
-set PERL_DL_NONLAZY=
-set PERL_ENCODING=
-set PERL_HASH_SEED=
-set PERL_HASH_SEED_DEBUG=
-set PERL_ROOT=
-set PERL_SIGNALS=
-set PERL_UNICODE=
-
-set errlev=0
-rem Start installer
-path
-echo "%~dp0install-tl" %*
-perl "%~dp0install-tl" %*
-
-rem The nsis installer will need this:
-if errorlevel 1 set errlev=1
-pause
-goto :eoff
-
-rem Subroutine to build search path without tex directories 
-rem any dir containing pdftex.exe is considered a tex dir
-:rebuildpath ";" dir list ...
-shift
-rem The first argument (";") serves as a marker to reset the path
-if "%~0"==";" set path=
-rem Finish if no more arguments to process
-if [%1]==[] goto :eof
-rem Continue if tex dir
-if exist "%~1\pdftex.exe" goto :rebuildpath
-rem Add dir to path
-set "path=%path%;%~1"
-goto :rebuildpath
-
-:DOS
-echo DOS and Windows 9x systems are not supported. Sorry.
-echo Windows 2000 or newer is required.
-pause
-
-:eoff
-if unc == 1 popd
diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir
index 6a5f455b9ba..91077075fd8 100755
--- a/Master/tlpkg/bin/tl-update-bindir
+++ b/Master/tlpkg/bin/tl-update-bindir
@@ -318,6 +318,12 @@ for tlname in $tlnames; do
     svn revert xindy*.mem
   fi
   
+  # and if xindy was deleted, revert it.
+  if svn status xindy.run | grep '^D' >/dev/null; then
+    $msg "reverting all xindy..."
+    svn revert tex2xindy texindy xindy xindy.mem xindy.run
+  fi
+  
   # check for broken symlinks.
   for sl in `cat $tmpdir/new.symlink`; do
     test ! -r "$sl" && echo "$0: broken new symlink $sl" >&2
diff --git a/Master/tlpkg/tlpsrc/wintools.win32.tlpsrc b/Master/tlpkg/tlpsrc/wintools.win32.tlpsrc
index 447ca8a207b..d708649e465 100644
--- a/Master/tlpkg/tlpsrc/wintools.win32.tlpsrc
+++ b/Master/tlpkg/tlpsrc/wintools.win32.tlpsrc
@@ -32,13 +32,15 @@ binpattern f bin/win32/unzip.exe
 binpattern f bin/win32/zip.exe
 binpattern f/win32 tlpkg/sam2p/sam2p.exe
 #
+# We do not enable luajitlatex in fmtutil.cnf, etc.,
+# but since Akira makes the binary, we might as well distribute it.
+binpattern f/win32 bin/win32/luajitlatex.exe
+#
 docpattern d texmf-dist/doc/gzip
 #
 # bitmap2eps is from Siep.
-#
 binpattern f/win32 bin/win32/bitmap2eps.exe
 runpattern f texmf-dist/scripts/bitmap2eps/bitmap2eps.vbs
-
 postaction filetype name="TL.bitmap2eps.convert" \
  cmd='"TEXDIR/bin/win32/bitmap2eps.exe" "%1"'
 postaction progid extension=.bmp filetype="TL.bitmap2eps.convert"