From 797a7742000961fdb33649477c7dd79f6c0d9d61 Mon Sep 17 00:00:00 2001 From: Daniel Klein Date: Mon, 20 Feb 2012 16:29:01 -0500 Subject: Dropped prefix assignments to LUA_INTERPRETER and added luajit. Also, combed source to see if interpreter var was used elsewhere, and it appears that it's only used in conjunction with the path, which is enough. --- install.bat | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/install.bat b/install.bat index 25037193..86766eb1 100644 --- a/install.bat +++ b/install.bat @@ -146,25 +146,34 @@ FOR %%L IN (%LUA_PREFIX% c:\lua\5.1.2 c:\lua c:\kepler\1.1) DO ( IF EXIST "%%L" ( IF NOT [%LUA_BINDIR%]==[] ( IF EXIST %LUA_BINDIR%\lua5.1.exe ( - SET LUA_INTERPRETER=%LUA_BINDIR%\lua5.1.exe + SET LUA_INTERPRETER=lua5.1.exe GOTO INTERPRETER_IS_SET ) IF EXIST %LUA_BINDIR%\lua.exe ( - SET LUA_INTERPRETER=%LUA_BINDIR%\lua.exe + SET LUA_INTERPRETER=lua.exe GOTO INTERPRETER_IS_SET - ) + ) + IF EXIST %LUA_BINDIR%\luajit.exe ( + SET LUA_INTERPRETER=luajit.exe + GOTO INTERPRETER_IS_SET + ) ECHO Lua executable lua.exe or lua5.1.exe not found in %LUA_BINDIR% GOTO ERROR ) SET CURR=%%L FOR %%E IN (\ \bin\) DO ( IF EXIST "%%L%%E\lua5.1.exe" ( - SET LUA_INTERPRETER=%%L%%E\lua5.1.exe + SET LUA_INTERPRETER=lua5.1.exe SET LUA_BINDIR=%%L%%E GOTO INTERPRETER_IS_SET ) IF EXIST "%%L%%E\lua.exe" ( - SET LUA_INTERPRETER=%%L%%E\lua.exe + SET LUA_INTERPRETER=lua.exe + SET LUA_BINDIR=%%L%%E + GOTO INTERPRETER_IS_SET + ) + IF EXIST "%%L%%E\luajit.exe" ( + SET LUA_INTERPRETER=luajit.exe SET LUA_BINDIR=%%L%%E GOTO INTERPRETER_IS_SET ) @@ -197,7 +206,7 @@ FOR %%L IN (%LUA_PREFIX% c:\lua\5.1.2 c:\lua c:\kepler\1.1) DO ( ) GOTO TRY_NEXT_LUA_DIR :INCDIR_IS_SET - %LUA_INTERPRETER% -v 2>NUL + %LUA_BINDIR%\%LUA_INTERPRETER% -v 2>NUL IF NOT ERRORLEVEL 1 ( GOTO LUA_IS_SET ) -- cgit v1.2.3-55-g6feb