cmd, Tests: ensure versioned directory is tried first

2 files changed, 3 insertions, 3 deletions

diff --git a/spec/util/test_env.lua b/spec/util/test_env.lua
index 269a1cfc..ed97973a 100644
--- a/spec/util/test_env.lua
+++ b/spec/util/test_env.lua
@@ -744,9 +744,9 @@ local function install_luarocks(install_env_vars)
       assert(execute_bool("install.bat /LUA " .. testing_paths.luadir .. " " .. compiler_flag .. " /P " .. testing_paths.testing_lrprefix .. " /NOREG /NOADMIN /F /Q /CONFIG " .. testing_paths.testing_lrprefix .. "/etc/luarocks", false, install_env_vars))
       assert(execute_bool(testing_paths.win_tools .. "/cp " .. testing_paths.testing_lrprefix .. "/lua/luarocks/core/site_config* " .. testing_paths.src_dir .. "/luarocks/core"))
    else
-      local incfile = test_env.file_if_exists(testing_paths.luadir .. "/include/lua.h")
-                   or test_env.file_if_exists(testing_paths.luadir .. "/include/lua/" .. test_env.lua_version .. "/lua.h")
+      local incfile = test_env.file_if_exists(testing_paths.luadir .. "/include/lua/" .. test_env.lua_version .. "/lua.h")
                    or test_env.file_if_exists(testing_paths.luadir .. "/include/lua" .. test_env.lua_version .. "/lua.h")
+                   or test_env.file_if_exists(testing_paths.luadir .. "/include/lua.h")
       local incdir = assert(incfile):gsub("/lua.h$", "")
 
       local lines = {
diff --git a/src/luarocks/cmd.lua b/src/luarocks/cmd.lua
index da78c224..813587e0 100644
--- a/src/luarocks/cmd.lua
+++ b/src/luarocks/cmd.lua
@@ -111,9 +111,9 @@ do
    local function find_lua_incdir(prefix, luaver, luajitver)
       luajitver = luajitver and luajitver:gsub("%-.*", "")
       local incdirs = {
-         prefix .. "/include",
          prefix .. "/include/lua/" .. luaver,
          prefix .. "/include/lua" .. luaver,
+         prefix .. "/include",
          prefix,
          luajitver and prefix .. "/include/luajit-" .. luajitver,
       }