diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2018-08-13 00:23:17 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2018-08-13 00:25:29 -0300 |
| commit | ba1e3c7831b17d937984b0f421ceeae021e92b7e (patch) | |
| tree | 1af3bee4ec621f29655c7d9acb5f5877daee2ed4 | |
| parent | ba3b3b9a162006d48b3923422affb4a6552763b7 (diff) | |
| download | luarocks-ba1e3c7831b17d937984b0f421ceeae021e92b7e.tar.gz luarocks-ba1e3c7831b17d937984b0f421ceeae021e92b7e.tar.bz2 luarocks-ba1e3c7831b17d937984b0f421ceeae021e92b7e.zip | |
deps: detect include/lua5x/lua.h (FreeBSD-style LUA_INCDIR)
This matches the change done in #872.
| -rw-r--r-- | src/luarocks/deps.lua | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua index 8403f127..a5b55a81 100644 --- a/src/luarocks/deps.lua +++ b/src/luarocks/deps.lua | |||
| @@ -477,9 +477,11 @@ end | |||
| 477 | 477 | ||
| 478 | local function find_lua_incdir(prefix, luaver, luajitver) | 478 | local function find_lua_incdir(prefix, luaver, luajitver) |
| 479 | luajitver = luajitver and luajitver:gsub("%-.*", "") | 479 | luajitver = luajitver and luajitver:gsub("%-.*", "") |
| 480 | local shortv = luaver:gsub("%.", "") | ||
| 480 | local incdirs = { | 481 | local incdirs = { |
| 481 | prefix .. "/include/lua/" .. luaver, | 482 | prefix .. "/include/lua/" .. luaver, |
| 482 | prefix .. "/include/lua" .. luaver, | 483 | prefix .. "/include/lua" .. luaver, |
| 484 | prefix .. "/include/lua" .. shortv, | ||
| 483 | prefix .. "/include", | 485 | prefix .. "/include", |
| 484 | prefix, | 486 | prefix, |
| 485 | luajitver and prefix .. "/include/luajit-" .. luajitver:match("^(%d+%.%d+)"), | 487 | luajitver and prefix .. "/include/luajit-" .. luajitver:match("^(%d+%.%d+)"), |