fix behavior of $(LUA)v2.0.10

4 files changed, 8 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 99f27963..c8d1d972 100644
--- a/Makefile
+++ b/Makefile
@@ -61,6 +61,10 @@ src/luarocks/site_config.lua: config.unix
         then \
            echo "LUAROCKS_FORCE_CONFIG=true" >> src/luarocks/site_config.lua ;\
         fi
+        if [ "$(LUA_DIR_SET)" = "yes" ] ;\
+        then \
+           echo "LUA_DIR_SET=true" >> src/luarocks/site_config.lua ;\
+        fi
         echo "LUAROCKS_UNAME_S=[[$(LUAROCKS_UNAME_S)]]" >> src/luarocks/site_config.lua
         echo "LUAROCKS_UNAME_M=[[$(LUAROCKS_UNAME_M)]]" >> src/luarocks/site_config.lua
         echo "LUAROCKS_DOWNLOADER=[[$(LUAROCKS_DOWNLOADER)]]" >> src/luarocks/site_config.lua
diff --git a/configure b/configure
index 041a1dc8..f00f7bc7 100755
--- a/configure
+++ b/configure
@@ -387,6 +387,7 @@ SYSCONFDIR=$SYSCONFDIR
 ROCKS_TREE=$ROCKS_TREE
 LUA_SUFFIX=$LUA_SUFFIX
 LUA_DIR=$LUA_DIR
+LUA_DIR_SET=$LUA_DIR_SET
 LUA_INCDIR=$LUA_INCDIR
 LUA_LIBDIR=$LUA_LIBDIR
 LUA_BINDIR=$LUA_BINDIR
diff --git a/rockspec b/rockspec
index d8718efd..781dc626 100644
--- a/rockspec
+++ b/rockspec
@@ -1,5 +1,5 @@
 package = "LuaRocks"
-local VER = "2.0.9"
+local VER = "2.0.10"
 local REV = "1"
 version = VER.."-"..REV
 
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index 48b40586..63285229 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -25,7 +25,7 @@ end
 _M.site_config = site_config
 
 lua_version = _VERSION:sub(5)
-program_version = "2.0.9"
+program_version = "2.0.10"
 user_agent = "LuaRocks/"..program_version
 
 local persist = require("luarocks.persist")
@@ -389,10 +389,10 @@ if detected.solaris then
 end
 
 -- Expose some more values detected by LuaRocks for use by rockspec authors.
-defaults.variables.LUA = defaults.lua_interpreter
 defaults.variables.LIB_EXTENSION = defaults.lib_extension
 defaults.variables.OBJ_EXTENSION = defaults.obj_extension
 defaults.variables.LUAROCKS_PREFIX = site_config.LUAROCKS_PREFIX
+defaults.variables.LUA = site_config.LUA_DIR_SET and (defaults.variables.LUA_BINDIR.."/"..defaults.lua_interpreter) or defaults.lua_interpreter
 
 -- Use defaults: