# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1367046625 -7200
# Node ID 00ec8a4f1615a587800e686521e9c88b9c584f7c
# Parent  2a2adc3727af3bb207d6bb1fa47d305ff84f60bc
nconf: remove compile_rules

diff -r 2a2adc3727af -r 00ec8a4f1615 mk-livestatus/receipt
--- a/mk-livestatus/receipt	Sat Apr 27 03:11:45 2013 +0200
+++ b/mk-livestatus/receipt	Sat Apr 27 09:10:25 2013 +0200
@@ -15,7 +15,7 @@
 compile_rules()
 {
 	cd $src
-	./configure && \
+	./configure &&
 	make && make -j1 install
 }
 
@@ -23,8 +23,8 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr
-	cp -a $_pkg/usr/bin $fs/usr
-	cp -a $_pkg/usr/lib $fs/usr
+	cp -a $install/usr/bin $fs/usr
+	cp -a $install/usr/lib $fs/usr
 }
 
 post_install()
diff -r 2a2adc3727af -r 00ec8a4f1615 nagios/receipt
--- a/nagios/receipt	Sat Apr 27 03:11:45 2013 +0200
+++ b/nagios/receipt	Sat Apr 27 09:10:25 2013 +0200
@@ -58,6 +58,7 @@
 	mkdir -p $fs/usr $fs/etc/init.d \
 	  $fs/var/lib/nagios/rw \
 	  $fs/var/run/nagios \
+	  $fs/var/log/nagios \
 	  $fs/var/spool/nagios/checkresults \
 	  $fs/etc/apache
 		
diff -r 2a2adc3727af -r 00ec8a4f1615 nconf/receipt
--- a/nconf/receipt	Sat Apr 27 03:11:45 2013 +0200
+++ b/nconf/receipt	Sat Apr 27 09:10:25 2013 +0200
@@ -10,13 +10,6 @@
 WEB_SITE="http://www.nconf.org/dokuwiki/doku.php"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	[ -d $PACKAGE-$VERSION ] || mv $PACKAGE $PACKAGE-$VERSION
-	cd $src
-}
-
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
@@ -26,7 +19,7 @@
 		$fs/etc/apache/conf.d \
 		$fs/etc/nagios/import
 		
-	cp  stuff/apache2-nconf.conf $fs/etc/apache/conf.d
+	cp  $stuff/apache2-nconf.conf $fs/etc/apache/conf.d
 	
 	# Copy files
 	cp -a $src/* $fs/usr/share/nconf
@@ -96,6 +89,7 @@
 
 post_remove()
 {
+	if [ -z $1 ]; then
 		local db=nconf
 		local db_user=nconf
 		local db_password=nconf
@@ -115,9 +109,10 @@
 				echo  -n "Delete user $db_user"
 				mysql -Be "delete from mysql.db where user='"$db_user"'" ; status
 			fi
-			unset $answer
+			unset answer
 			;;
 		*)
 			;;
 		esac
+	fi
 }