diff --git a/src/build/compile.sh b/src/build/compile.sh index 1579b1e9c..7e962e985 100755 --- a/src/build/compile.sh +++ b/src/build/compile.sh @@ -234,8 +234,8 @@ if [ "$1" == "crosscompile" ]; then CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-opcache=no" fi -./configure $OPTIMIZATION--prefix="$DIR/php5" \ ---exec-prefix="$DIR/php5" \ +./configure $OPTIMIZATION--prefix="$DIR/bin/php" \ +--exec-prefix="$DIR/bin/php" \ --with-curl="$HAVE_CURL" \ --with-zlib="$DIR/install_data/php/ext/zlib" \ --with-zlib-dir="$DIR/install_data/php/ext/zlib" \ diff --git a/start.sh b/start.sh index 2e849db47..2110fcb4b 100755 --- a/start.sh +++ b/start.sh @@ -1,13 +1,8 @@ #!/bin/bash DIR="$(cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" cd "$DIR" -if [ -f ./php5/bin/php ]; then - mkdir -m 0777 bin/ - mv ./php5/bin/php ./bin/php - rm -r -f ./php5/ -fi -if [ -f ./bin/php ]; then - ./bin/php -d enable_dl=On PocketMine-MP.php $@ +if [ -f ./bin/php/php ]; then + ./bin/php/php -d enable_dl=On PocketMine-MP.php $@ else echo "[WARNING] You are not using the standalone PocketMine-MP PHP binary." php -d enable_dl=On PocketMine-MP.php $@