diff --git a/s/cmake-init b/s/cmake-init index 481bfee80..2cd5b4834 100755 --- a/s/cmake-init +++ b/s/cmake-init @@ -46,9 +46,9 @@ if [ "$HAVE_TOLUA" = "0" ] || [ -z $path ] ; then echo "tolua is not installed, building from source" cd $ROOT if [ ! -d tolua ]; then - LUA_VERSION="5.2" - if [ ! -d /usr/include/lua5.2 ] ; then - LUA_VERSION="5.1" + LUA_VERSION="5.1" + if [ -d /usr/include/lua5.2 ] || [ -d /usr/local/include/lua5.2 ]; then + LUA_VERSION="5.2" fi echo "fetching tolua ${LUA_VERSION} from github..." git clone https://github.com/ennorehling/tolua-${LUA_VERSION}.git tolua diff --git a/s/travis-build b/s/travis-build index 45db05c60..011e9e7de 100755 --- a/s/travis-build +++ b/s/travis-build @@ -18,7 +18,6 @@ cd tests set -e [ -z $BUILD ] && BUILD=Debug ; export BUILD -cmake --version s/cmake-init s/build cd $ROOT