From 55f48118478e16fce0d65c79e3ef481fbe7ec745 Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Wed, 29 Jan 2014 18:56:21 +0100 Subject: [PATCH] Oops ;) --- src/build/compile.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/build/compile.sh b/src/build/compile.sh index 1ddc754c3..1579b1e9c 100755 --- a/src/build/compile.sh +++ b/src/build/compile.sh @@ -109,6 +109,7 @@ fi rm -r -f install_data/ >> "$DIR/install.log" 2>&1 +rm -r -f php5/ >> "$DIR/install.log" 2>&1 rm -r -f bin/ >> "$DIR/install.log" 2>&1 mkdir -m 0777 install_data >> "$DIR/install.log" 2>&1 mkdir -m 0777 php5 >> "$DIR/install.log" 2>&1 @@ -233,8 +234,8 @@ if [ "$1" == "crosscompile" ]; then CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-opcache=no" fi -./configure $OPTIMIZATION--prefix="$DIR/bin" \ ---exec-prefix="$DIR/bin" \ +./configure $OPTIMIZATION--prefix="$DIR/php5" \ +--exec-prefix="$DIR/php5" \ --with-curl="$HAVE_CURL" \ --with-zlib="$DIR/install_data/php/ext/zlib" \ --with-zlib-dir="$DIR/install_data/php/ext/zlib" \ @@ -279,6 +280,10 @@ echo " done!" cd "$DIR" echo -n "[INFO] Cleaning up..." rm -r -f install_data/ >> "$DIR/install.log" 2>&1 +mv php5/bin/php bin/php +mv php5/bin/phpize bin/phpize +mv php5/bin/php-config bin/php-config +rm -r -f php5/ >> "$DIR/install.log" 2>&1 date >> "$DIR/install.log" 2>&1 echo " done!" echo "[PocketMine] You should start the server now using \"./start.sh.\""