diff options
-rwxr-xr-x | configure | 1 | ||||
-rw-r--r-- | src/luarocks/deps.lua | 1 |
2 files changed, 2 insertions, 0 deletions
@@ -433,6 +433,7 @@ check_incdir() { | |||
433 | for lua_h in \ | 433 | for lua_h in \ |
434 | "$incdir/lua/$LUA_VERSION/lua.h" \ | 434 | "$incdir/lua/$LUA_VERSION/lua.h" \ |
435 | "$incdir/lua$LUA_VERSION/lua.h" \ | 435 | "$incdir/lua$LUA_VERSION/lua.h" \ |
436 | "$incdir/lua-$LUA_VERSION/lua.h" \ | ||
436 | "$incdir/lua$(echo "$LUA_VERSION" | tr -d .)/lua.h" \ | 437 | "$incdir/lua$(echo "$LUA_VERSION" | tr -d .)/lua.h" \ |
437 | "$incdir/lua.h" \ | 438 | "$incdir/lua.h" \ |
438 | $("$LUA_BINDIR/$LUA_INTERPRETER" -e 'print(jit and [['"$incdir"'/luajit-]]..jit.version:match("(%d+%.%d+)")..[[/lua.h]] or "")') | 439 | $("$LUA_BINDIR/$LUA_INTERPRETER" -e 'print(jit and [['"$incdir"'/luajit-]]..jit.version:match("(%d+%.%d+)")..[[/lua.h]] or "")') |
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua index b72661b7..0eb80193 100644 --- a/src/luarocks/deps.lua +++ b/src/luarocks/deps.lua | |||
@@ -655,6 +655,7 @@ local function find_lua_incdir(prefix, luaver, luajitver) | |||
655 | local incdirs = { | 655 | local incdirs = { |
656 | prefix .. "/include/lua/" .. luaver, | 656 | prefix .. "/include/lua/" .. luaver, |
657 | prefix .. "/include/lua" .. luaver, | 657 | prefix .. "/include/lua" .. luaver, |
658 | prefix .. "/include/lua-" .. luaver, | ||
658 | prefix .. "/include/lua" .. shortv, | 659 | prefix .. "/include/lua" .. shortv, |
659 | prefix .. "/include", | 660 | prefix .. "/include", |
660 | prefix, | 661 | prefix, |