From 8580df1a98ba200e9a7b0ae9c08c667b738bd7f6 Mon Sep 17 00:00:00 2001 From: Thijs Schreijer Date: Mon, 7 Oct 2013 11:24:59 +0200 Subject: make installer find interpreter by short versioned name, eg. lua52.exe instead of lua5.2.exe --- install.bat | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/install.bat b/install.bat index 99dc7fa7..87c7b5a2 100644 --- a/install.bat +++ b/install.bat @@ -16,7 +16,7 @@ vars.LUA_INCDIR = nil vars.LUA_LIBDIR = nil vars.LUA_LIBNAME = nil vars.LUA_VERSION = "5.1" -vars.LUA_SHORTV = nil +vars.LUA_SHORTV = nil -- "51" vars.LUA_LIB_NAMES = "lua5.1.lib lua51.dll liblua.dll.a" vars.LUA_RUNTIME = nil @@ -180,6 +180,10 @@ local function look_for_interpreter (directory) vars.LUA_INTERPRETER = S"lua$LUA_VERSION.exe" print(S" Found $LUA_BINDIR\\$LUA_INTERPRETER") return true + elseif exists( S"$LUA_BINDIR\\lua$LUA_SHORTV.exe" ) then + vars.LUA_INTERPRETER = S"lua$LUA_SHORTV.exe" + print(S" Found $LUA_BINDIR\\$LUA_INTERPRETER") + return true elseif exists(S"$LUA_BINDIR\\lua.exe") then vars.LUA_INTERPRETER = "lua.exe" print(S" Found $LUA_BINDIR\\$LUA_INTERPRETER") @@ -199,6 +203,12 @@ local function look_for_interpreter (directory) print(" Found ."..e..vars.LUA_INTERPRETER) return true + elseif exists(directory..e.."\\lua"..vars.LUA_SHORTV..".exe") then + vars.LUA_INTERPRETER = S"lua$LUA_SHORTV.exe" + vars.LUA_BINDIR = directory .. e + print(" Found ."..e..vars.LUA_INTERPRETER) + return true + elseif exists(directory..e.."\\lua.exe") then vars.LUA_INTERPRETER = "lua.exe" vars.LUA_BINDIR = directory..e -- cgit v1.2.3-55-g6feb