2 files changed, 11 insertions, 10 deletions

diff --git a/install.bat b/install.bat
index d83dfbf1..ec20e4dc 100644
--- a/install.bat
+++ b/install.bat
@@ -360,7 +360,7 @@ local function look_for_headers (directory)
                 die(S"lua.h not found in $LUA_INCDIR")

         end

 

-        for _, e in ipairs{ [[\]], [[\include\]]} do

+        for _, e in ipairs{ 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,6 +583,7 @@ 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

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

 Will configure LuaRocks with the following paths:

 LuaRocks        : $FULL_PREFIX

-Config file     : $SYSCONFDIR\config.lua

+Config file     : $SYSCONFDIR\$SYSCONFFILENAME

 Rocktree        : $TREE_ROOT

 

 Lua interpreter : $LUA_BINDIR\$LUA_INTERPRETER

@@ -811,7 +812,7 @@ else
 end

 f:write(S[=[

 site_config.LUAROCKS_UNAME_M=[[$UNAME_M]]

-site_config.LUAROCKS_SYSCONFIG=[[$SYSCONFDIR\config.lua]]

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

 site_config.LUAROCKS_ROCKS_TREE=[[$TREE_ROOT]]

 site_config.LUAROCKS_PREFIX=[[$PREFIX]]

 site_config.LUAROCKS_DOWNLOADER=[[wget]]

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

 

 -- create config file

-vars.CONFIG_FILE = vars.SYSCONFDIR.."\\config.lua"

+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, "config.bak")

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

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

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

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

diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index f5d7fb5e..31b3211a 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -216,10 +216,10 @@ end
 
 -- Load system configuration file
 do 
-   sys_config_file_default = sys_config_dir.."/config.lua"
+   sys_config_file_default = sys_config_dir.."/config-"..cfg.lua_version..".lua"
    sys_config_file = load_config_file({
-      site_config.LUAROCKS_SYSCONFIG or sys_config_dir.."/config-"..cfg.lua_version..".lua",
-      sys_config_file_default,
+      site_config.LUAROCKS_SYSCONFIG or sys_config_file_default,
+      sys_config_dir.."/config.lua",
    })
    sys_config_ok = (sys_config_file ~= nil)
 end
@@ -227,11 +227,11 @@ end
 -- Load user configuration file (if allowed)
 if not site_config.LUAROCKS_FORCE_CONFIG then
   
-   home_config_file_default = home_config_dir.."/config.lua"
+   home_config_file_default = home_config_dir.."/config-"..cfg.lua_version..".lua"
    local list = {
       os.getenv("LUAROCKS_CONFIG_" .. version_suffix) or os.getenv("LUAROCKS_CONFIG"),
-      home_config_dir.."/config-"..cfg.lua_version..".lua",
       home_config_file_default,
+      home_config_dir.."/config.lua",
    }
    -- first entry might be a silent nil, check and remove if so
    if not list[1] then table.remove(list, 1) end