# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1305562227 -7200
# Node ID b58ede60af7d8d88fda5cc3d64bd88dc55e0e16c
# Parent  cb5c920771cabe2420446b68faf9cd63c60e05e9
php: try to fix again

diff -r cb5c920771ca -r b58ede60af7d php/receipt
--- a/php/receipt	Mon May 16 17:52:43 2011 +0200
+++ b/php/receipt	Mon May 16 18:10:27 2011 +0200
@@ -59,37 +59,36 @@
 --with-curl=shared \
 "
 	sed -i 's/pam_start/pam_nostart/' configure
-	./configure $COMMON_ARGS $CONFIGURE_ARGS && \
-	make -j 4 && make INSTALL_ROOT=$PWD/install install
-	./configure $COMMON_ARGS --with-apxs2=/usr/bin/apxs $CONFIGURE_ARGS && \
+	./configure $COMMON_ARGS && \
+	make -j 4 && make INSTALL_ROOT=$DESTDIR install
+	./configure $COMMON_ARGS --with-apxs2=/usr/bin/apxs && \
 	make -j 4 && {
 		mkdir -p $install/etc/apache
 		cp /etc/apache/httpd.conf $install/etc/apache/httpd.conf
-		make INSTALL_ROOT=$install install
+		make INSTALL_ROOT=$DESTDIR install
 	}
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/bin $fs/etc $fs/usr/share
+	mkdir -p $fs/usr/bin $fs/etc $fs/usr/share/php
 	cp -a $src/sapi/cgi/php-cgi $fs/usr/bin
-	
 	# Recommended config file and phpinfo.
-	cp $src/php.ini-recommended $install/etc/php.ini
+	cp $src/php.ini-recommended $fs/etc/php.ini
 	sed -e 's|extension_dir = "./"|extension_dir = "/usr/share/php/"|' \
 	    -i $fs/etc/php.ini
 	cp -a $stuff/phpinfo $install/usr/share
 }
 
-# Post and pre install commands to stop
-# and restart Web server if needed.
+# Post and pre install commands to stop and restart Web server if needed.
 pre_install()
 {
 	if [ -f "$1/var/run/lighttpd.pid" ]; then
 		/etc/init.d/lighttpd stop
 	fi
 }
+
 post_install()
 {
 	# Enable php