diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2018-07-04 11:59:01 -0300 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2018-07-04 18:17:53 -0300 |
commit | b8d84a0b130622e16ab0e37c3c43d9844434a5c5 (patch) | |
tree | 344965d3ab65a8ae41c483f8246483cb8580f7c7 /configure | |
parent | 39d522622f07266892fb61113509711c4798421f (diff) | |
download | luarocks-b8d84a0b130622e16ab0e37c3c43d9844434a5c5.tar.gz luarocks-b8d84a0b130622e16ab0e37c3c43d9844434a5c5.tar.bz2 luarocks-b8d84a0b130622e16ab0e37c3c43d9844434a5c5.zip |
config file: do not assume 'variable' table exists (for compat with LR2)
This change results in a default config that works in both LuaRocks 2 and 3.
We do not promise a compatible configuration format, but it's nice to avoid
unnecessary breakage if we can.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -485,10 +485,12 @@ EOF | |||
485 | echo ' { name = "system", root = "'"$ROCKS_TREE"'" },' | 485 | echo ' { name = "system", root = "'"$ROCKS_TREE"'" },' |
486 | echo '}' | 486 | echo '}' |
487 | if [ -n "$LUA_INTERPRETER" ]; then echo 'lua_interpreter = "'"$LUA_INTERPRETER"'"' ; fi | 487 | if [ -n "$LUA_INTERPRETER" ]; then echo 'lua_interpreter = "'"$LUA_INTERPRETER"'"' ; fi |
488 | if [ -n "$LUA_DIR" ]; then echo 'variables.LUA_DIR = "'"$LUA_DIR"'"' ; fi | 488 | echo 'variables = {' |
489 | if [ -n "$LUA_INCDIR" ]; then echo 'variables.LUA_INCDIR = "'"$LUA_INCDIR"'"' ; fi | 489 | if [ -n "$LUA_DIR" ]; then echo ' LUA_DIR = "'"$LUA_DIR"'",' ; fi |
490 | if [ -n "$LUA_BINDIR" ]; then echo 'variables.LUA_BINDIR = "'"$LUA_BINDIR"'"' ; fi | 490 | if [ -n "$LUA_INCDIR" ]; then echo ' LUA_INCDIR = "'"$LUA_INCDIR"'",' ; fi |
491 | if [ -n "$LUA_LIBDIR" ]; then echo 'variables.LUA_LIBDIR = "'"$LUA_LIBDIR"'"' ; fi | 491 | if [ -n "$LUA_BINDIR" ]; then echo ' LUA_BINDIR = "'"$LUA_BINDIR"'",' ; fi |
492 | if [ -n "$LUA_LIBDIR" ]; then echo ' LUA_LIBDIR = "'"$LUA_LIBDIR"'",' ; fi | ||
493 | echo '}' | ||
492 | } > "config-$LUA_VERSION.lua.in" | 494 | } > "config-$LUA_VERSION.lua.in" |
493 | 495 | ||
494 | echo | 496 | echo |