wok rev 10819

php*: move php/stuff to common files (we have php.png installed twice and no desktop file for phpinfo)
author Christophe Lincoln <pankso@slitaz.org>
date Mon Jun 06 01:19:52 2011 +0200 (2011-06-06)
parents 2c795c9fface
children a232d3bffb2a
files php-common/receipt php/receipt
line diff
     1.1 --- a/php-common/receipt	Mon Jun 06 00:44:11 2011 +0200
     1.2 +++ b/php-common/receipt	Mon Jun 06 01:19:52 2011 +0200
     1.3 @@ -12,11 +12,13 @@
     1.4  # Rules to gen a SliTaz package suitable for Tazpkg.
     1.5  genpkg_rules()
     1.6  {
     1.7 -	mkdir -p $fs/usr/share $fs/etc
     1.8 -	cp -a $_pkg/usr/share/phpinfo $fs/usr/share
     1.9 -	cp -a $_pkg/usr/share/applications $fs/usr/share
    1.10 -	cp -a $_pkg/usr/share/pixmaps $fs/usr/share
    1.11 -	cp $_pkg/etc/php.ini $fs/etc
    1.12 +	mkdir -p $fs/etc \
    1.13 +		$fs/usr/share/applications \
    1.14 +		$fs/usr/share/pixmaps
    1.15 +	cp -a $stuff/phpinfo $fs/usr/share
    1.16 +	cp $stuff/php.desktop $fs/usr/share/applications 
    1.17 +	cp $stuff/php.png $fs/usr/share/pixmaps 
    1.18 +	cp $install/etc/php.ini $fs/etc
    1.19  }
    1.20  
    1.21  # Post and pre install commands
     2.1 --- a/php/receipt	Mon Jun 06 00:44:11 2011 +0200
     2.2 +++ b/php/receipt	Mon Jun 06 01:19:52 2011 +0200
     2.3 @@ -67,21 +67,18 @@
     2.4  		cp /etc/apache/httpd.conf $DESTDIR/etc/apache/httpd.conf
     2.5  		make INSTALL_ROOT=$DESTDIR install
     2.6  	}
     2.7 -	# Recommended config file and phpinfo.
     2.8 -	cp $src/php.ini-recommended $DESTDIR/etc/php.ini
     2.9 +	# Recommended config file.
    2.10 +	mkdir -p $DESTDIR/etc
    2.11 +	cp $src/php.ini-recommended $DESTDIR/etc/php.ini || exit 1
    2.12  	sed -e 's|extension_dir = "./"|extension_dir = "/usr/share/php/"|' \
    2.13  		-i $DESTDIR/etc/php.ini
    2.14 -	mkdir -p $DESTDIR/usr/share/applicattions $DESTDIR/usr/share/pixmaps
    2.15 -	cp $stuff/php.desktop $DESTDIR/usr/share/applications
    2.16 -	cp $stuff/php.png $DESTDIR/usr/share/pixmaps
    2.17  }
    2.18  
    2.19  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.20  genpkg_rules()
    2.21  {
    2.22 -	mkdir -p $fs/usr/bin $fs/etc $fs/usr/share/php
    2.23 +	mkdir -p $fs/usr/bin $fs/usr/share/php
    2.24  	cp -a $src/sapi/cgi/php-cgi $fs/usr/bin
    2.25 -	cp -a $stuff/phpinfo $install/usr/share
    2.26  }
    2.27  
    2.28  # Post and pre install commands to stop and restart Web server if needed.