# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1307315992 -7200
# Node ID 5f0378f7067cec51422a41d02520c946103ac261
# Parent  2c795c9ffacef396cf94fe1e016f70014174694e
php*: move php/stuff to common files (we have php.png installed twice and no desktop file for phpinfo)

diff -r 2c795c9fface -r 5f0378f7067c php-common/receipt
--- a/php-common/receipt	Mon Jun 06 00:44:11 2011 +0200
+++ b/php-common/receipt	Mon Jun 06 01:19:52 2011 +0200
@@ -12,11 +12,13 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/share $fs/etc
-	cp -a $_pkg/usr/share/phpinfo $fs/usr/share
-	cp -a $_pkg/usr/share/applications $fs/usr/share
-	cp -a $_pkg/usr/share/pixmaps $fs/usr/share
-	cp $_pkg/etc/php.ini $fs/etc
+	mkdir -p $fs/etc \
+		$fs/usr/share/applications \
+		$fs/usr/share/pixmaps
+	cp -a $stuff/phpinfo $fs/usr/share
+	cp $stuff/php.desktop $fs/usr/share/applications 
+	cp $stuff/php.png $fs/usr/share/pixmaps 
+	cp $install/etc/php.ini $fs/etc
 }
 
 # Post and pre install commands
diff -r 2c795c9fface -r 5f0378f7067c php/receipt
--- a/php/receipt	Mon Jun 06 00:44:11 2011 +0200
+++ b/php/receipt	Mon Jun 06 01:19:52 2011 +0200
@@ -67,21 +67,18 @@
 		cp /etc/apache/httpd.conf $DESTDIR/etc/apache/httpd.conf
 		make INSTALL_ROOT=$DESTDIR install
 	}
-	# Recommended config file and phpinfo.
-	cp $src/php.ini-recommended $DESTDIR/etc/php.ini
+	# Recommended config file.
+	mkdir -p $DESTDIR/etc
+	cp $src/php.ini-recommended $DESTDIR/etc/php.ini || exit 1
 	sed -e 's|extension_dir = "./"|extension_dir = "/usr/share/php/"|' \
 		-i $DESTDIR/etc/php.ini
-	mkdir -p $DESTDIR/usr/share/applicattions $DESTDIR/usr/share/pixmaps
-	cp $stuff/php.desktop $DESTDIR/usr/share/applications
-	cp $stuff/php.png $DESTDIR/usr/share/pixmaps
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/bin $fs/etc $fs/usr/share/php
+	mkdir -p $fs/usr/bin $fs/usr/share/php
 	cp -a $src/sapi/cgi/php-cgi $fs/usr/bin
-	cp -a $stuff/phpinfo $install/usr/share
 }
 
 # Post and pre install commands to stop and restart Web server if needed.