1 files changed, 15 insertions, 6 deletions

diff --git a/install.bat b/install.bat
index 5913d3ab..57e3611c 100644
--- a/install.bat
+++ b/install.bat
@@ -8,6 +8,8 @@ local vars = {}
 vars.PREFIX = nil

 vars.VERSION = "2.2"

 vars.SYSCONFDIR = nil

+vars.SYSCONFFILENAME = nil

+vars.CONFIG_FILE = nil

 vars.TREE_ROOT = nil

 vars.TREE_BIN = nil

 vars.TREE_LMODULE = nil

@@ -360,7 +362,14 @@ local function look_for_headers (directory)
                 die(S"lua.h not found in $LUA_INCDIR")

         end

 

-        for _, e in ipairs{ S([[\include\lua\$LUA_VERSION]]), S([[\include\$LUA_VERSION]]), [[\]], [[\include\]]} do

+        for _, e in ipairs{ 

+        S([[\include\lua\$LUA_VERSION]]), 

+        S([[\include\lua$LUA_SHORTV]]), 

+        S([[\include\lua$LUA_VERSION]]), 

+        S([[\include\$LUA_VERSION]]), 

+        [[\include\]],

+        [[\]], 

+      } do

                 print("    checking for "..directory..e.."\\lua.h")

                 if exists(directory..e.."\\lua.h") then

                         vars.LUA_INCDIR = directory..e

@@ -583,7 +592,6 @@ vars.LIBDIR = vars.FULL_PREFIX
 vars.LUADIR = S"$FULL_PREFIX\\lua"

 vars.INCDIR = S"$FULL_PREFIX\\include"

 vars.LUA_SHORTV = vars.LUA_VERSION:gsub("%.", "")

-vars.SYSCONFFILENAME = S"config-$LUA_VERSION.lua"

 

 if INSTALL_LUA then

         if vars.LUA_VERSION ~= "5.1" then

@@ -611,6 +619,8 @@ else
         datapath = os.getenv("ProgramW6432") .. [[\LuaRocks]]

 end

 vars.SYSCONFDIR = vars.SYSCONFDIR or vars.PREFIX

+vars.SYSCONFFILENAME = S"config-$LUA_VERSION.lua"

+vars.CONFIG_FILE = vars.SYSCONFDIR.."\\"..vars.SYSCONFFILENAME

 vars.TREE_ROOT = vars.TREE_ROOT or datapath..[[\systree]]

 if SELFCONTAINED then

         vars.SYSCONFDIR = vars.PREFIX

@@ -626,7 +636,7 @@ print(S[[
 

 Will configure LuaRocks with the following paths:

 LuaRocks        : $FULL_PREFIX

-Config file     : $SYSCONFDIR\$SYSCONFFILENAME

+Config file     : $CONFIG_FILE

 Rocktree        : $TREE_ROOT

 

 Lua interpreter : $LUA_BINDIR\$LUA_INTERPRETER

@@ -813,7 +823,7 @@ else
 end

 f:write(S[=[

 site_config.LUAROCKS_UNAME_M=[[$UNAME_M]]

-site_config.LUAROCKS_SYSCONFIG=[[$SYSCONFDIR\$SYSCONFFILENAME]]

+site_config.LUAROCKS_SYSCONFIG=[[$CONFIG_FILE]]

 site_config.LUAROCKS_ROCKS_TREE=[[$TREE_ROOT]]

 site_config.LUAROCKS_PREFIX=[[$PREFIX]]

 site_config.LUAROCKS_DOWNLOADER=[[wget]]

@@ -834,12 +844,11 @@ f:close()
 print(S([[Created LuaRocks site-config file: $LUADIR\luarocks\]]..site_config..[[.lua]]))

 

 -- create config file

-vars.CONFIG_FILE = vars.SYSCONFDIR.."\\"..vars.SYSCONFFILENAME

 if not exists(vars.SYSCONFDIR) then

         mkdir(vars.SYSCONFDIR)

 end

 if exists(vars.CONFIG_FILE) then

-        local nname = backup(vars.CONFIG_FILE, S"config-$LUA_VERSION.bak")

+        local nname = backup(vars.CONFIG_FILE, vars.SYSCONFFILENAME..".bak")

         print("***************")

         print(S"*** WARNING *** LuaRocks config file already exists: '$CONFIG_FILE'. The old file has been renamed to '"..nname.."'")

         print("***************")