diff --git a/s/cmake-init b/s/cmake-init index 8b9c95085..167ec2fd6 100755 --- a/s/cmake-init +++ b/s/cmake-init @@ -78,22 +78,21 @@ fi DEST=$(dirname $ROOT)/server -LUA_VERSION="5.2" +TOLUA_VERSION="5.2" LUA_INCLUDE=/usr/include LUA_DIR=/usr -if [ -d /usr/local/include/lua5.3 ]; then - LUA_VERSION="5.3" - LUA_INCLUDE=/usr/local/include/lua5.3 +if [ -d /usr/local/include/lua ]; then + TOLUA_VERSION="5.2" + LUA_INCLUDE=/usr/local/include/lua elif [ -d /usr/include/lua5.2 ]; then - export LUA_DIR=/usr - LUA_VERSION="5.2" + TOLUA_VERSION="5.2" LUA_INCLUDE=/usr/include/lua5.2 elif [ -d /usr/include/lua5.1 ]; then - LUA_VERSION="5.1" + TOLUA_VERSION="5.1" LUA_INCLUDE=/usr/include/lua5.1 elif [ -d /usr/local/include/lua5.1 ]; then - export LUA_DIR=/usr/local - LUA_VERSION="5.1" + LUA_DIR=/usr/local + TOLUA_VERSION="5.1" LUA_INCLUDE=/usr/local/include/lua5.1 fi @@ -116,8 +115,8 @@ if [ "$HAVE_TOLUA" = "0" ] || [ -z $path ] ; then echo "tolua is not installed, building from source" cd $ROOT if [ ! -d tolua/include ]; then - echo "fetching tolua ${LUA_VERSION} from github..." - git clone https://github.com/ennorehling/tolua-${LUA_VERSION}.git tolua + echo "fetching tolua ${TOLUA_VERSION} from github..." + git clone https://github.com/ennorehling/tolua-${TOLUA_VERSION}.git tolua fi echo "building tolua..." cd tolua