aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2014-01-11 18:34:32 -0200
committerHisham Muhammad <hisham@gobolinux.org>2014-01-11 18:34:32 -0200
commit77f68c79217cea4e5244d3403fc089e3d8dabd82 (patch)
tree94910ca23466175fe261f4d32adb5bcf02c6410b
parentd6b97cf5130420b44cb6c7deb2440ce11cf161e0 (diff)
parent17f1c5d3600fa24c670d78bc9e9931502309bf36 (diff)
downloadluarocks-77f68c79217cea4e5244d3403fc089e3d8dabd82.tar.gz
luarocks-77f68c79217cea4e5244d3403fc089e3d8dabd82.tar.bz2
luarocks-77f68c79217cea4e5244d3403fc089e3d8dabd82.zip
Merge branch 'master' of github.com:keplerproject/luarocks
-rwxr-xr-xconfigure2
-rw-r--r--install.bat2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index ce5e78f8..166d6898 100755
--- a/configure
+++ b/configure
@@ -286,7 +286,7 @@ fi
286 286
287if [ "$LUA_DIR_SET" != "yes" ] 287if [ "$LUA_DIR_SET" != "yes" ]
288then 288then
289 if [ -n "$find_lua" ] 289 if [ -z "$find_lua" ]
290 then 290 then
291 echo_n "Looking for Lua... " 291 echo_n "Looking for Lua... "
292 find_lua=`find_program lua$LUA_SUFFIX` 292 find_lua=`find_program lua$LUA_SUFFIX`
diff --git a/install.bat b/install.bat
index 22cdd523..dfd94317 100644
--- a/install.bat
+++ b/install.bat
@@ -696,7 +696,7 @@ for _, c in ipairs{"luarocks", "luarocks-admin"} do
696SETLOCAL 696SETLOCAL
697SET "LUA_PATH=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH%" 697SET "LUA_PATH=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH%"
698IF NOT "%LUA_PATH_5_2%"=="" ( 698IF NOT "%LUA_PATH_5_2%"=="" (
699 "SET LUA_PATH_5_2=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH_5_2%" 699 SET "LUA_PATH_5_2=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH_5_2%"
700) 700)
701SET "PATH=$BINDIR;%PATH%" 701SET "PATH=$BINDIR;%PATH%"
702"$LUA_INTERPRETER" "$BINDIR\]]..c..[[.lua" %* 702"$LUA_INTERPRETER" "$BINDIR\]]..c..[[.lua" %*