SliTaz Repositories

     1.1 --- a/php/receipt	Mon May 16 17:52:43 2011 +0200
     1.2 +++ b/php/receipt	Mon May 16 18:10:27 2011 +0200
     1.3 @@ -59,37 +59,36 @@
     1.4  --with-curl=shared \
     1.5  "
     1.6  	sed -i 's/pam_start/pam_nostart/' configure
     1.7 -	./configure $COMMON_ARGS $CONFIGURE_ARGS && \
     1.8 -	make -j 4 && make INSTALL_ROOT=$PWD/install install
     1.9 -	./configure $COMMON_ARGS --with-apxs2=/usr/bin/apxs $CONFIGURE_ARGS && \
    1.10 +	./configure $COMMON_ARGS && \
    1.11 +	make -j 4 && make INSTALL_ROOT=$DESTDIR install
    1.12 +	./configure $COMMON_ARGS --with-apxs2=/usr/bin/apxs && \
    1.13  	make -j 4 && {
    1.14  		mkdir -p $install/etc/apache
    1.15  		cp /etc/apache/httpd.conf $install/etc/apache/httpd.conf
    1.16 -		make INSTALL_ROOT=$install install
    1.17 +		make INSTALL_ROOT=$DESTDIR install
    1.18  	}
    1.19  }
    1.20  
    1.21  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.22  genpkg_rules()
    1.23  {
    1.24 -	mkdir -p $fs/usr/bin $fs/etc $fs/usr/share
    1.25 +	mkdir -p $fs/usr/bin $fs/etc $fs/usr/share/php
    1.26  	cp -a $src/sapi/cgi/php-cgi $fs/usr/bin
    1.27 -	
    1.28  	# Recommended config file and phpinfo.
    1.29 -	cp $src/php.ini-recommended $install/etc/php.ini
    1.30 +	cp $src/php.ini-recommended $fs/etc/php.ini
    1.31  	sed -e 's|extension_dir = "./"|extension_dir = "/usr/share/php/"|' \
    1.32  	    -i $fs/etc/php.ini
    1.33  	cp -a $stuff/phpinfo $install/usr/share
    1.34  }
    1.35  
    1.36 -# Post and pre install commands to stop
    1.37 -# and restart Web server if needed.
    1.38 +# Post and pre install commands to stop and restart Web server if needed.
    1.39  pre_install()
    1.40  {
    1.41  	if [ -f "$1/var/run/lighttpd.pid" ]; then
    1.42  		/etc/init.d/lighttpd stop
    1.43  	fi
    1.44  }
    1.45 +
    1.46  post_install()
    1.47  {
    1.48  	# Enable php