# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1208905306 -7200
# Node ID 2f416a878f2ef0d41762c9f21e92fd0785146167
# Parent  782ec3de9ca47c278dc7555fb6c8ad911beadd6d
Fixed cups install dir (Thanks Erjo) and fix init script

diff -r 782ec3de9ca4 -r 2f416a878f2e cups/receipt
--- a/cups/receipt	Wed Apr 23 02:41:57 2008 +0200
+++ b/cups/receipt	Wed Apr 23 01:01:46 2008 +0200
@@ -16,13 +16,13 @@
 {
 	cd $src
 	./configure \
-		--prefix=$PWD/_pkg/usr \
-		--sysconfdir=$PWD/_pkg/etc \
-		--localstatedir=$PWD/_pkg/var \
-		--mandir=$PWD/_pkg/usr/share/man \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS
 	make
-	make install
+	make BUILDROOT=$PWD/_pkg install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 782ec3de9ca4 -r 2f416a878f2e cups/stuff/etc/init.d/cupsd
--- a/cups/stuff/etc/init.d/cupsd	Wed Apr 23 02:41:57 2008 +0200
+++ b/cups/stuff/etc/init.d/cupsd	Wed Apr 23 01:01:46 2008 +0200
@@ -15,26 +15,26 @@
 PIDFILE=/var/run/cups/cups.sock
 
 case "$1" in
-  stop)
-    echo -n "Stopping $DESC: $NAME... "
-    killall $DAEMON 2>/dev/null
-    rm -f $PIDFILE
-    status
-    ;;
-  start|restart)
-    echo -n "Restarting $DESC: $NAME... "
-    killall $DAEMON 2>/dev/null
-    rm -f $PIDFILE
-    sleep 2
-    $DAEMON $OPTIONS
-    status
-    ;;
-  *)
-    echo ""
-    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
-    echo ""
-    exit 1
-    ;;
+	stop)
+		echo -n "Stopping $DESC: $NAME... "
+		killall -q cupsd
+		status
+		;;
+	start)
+		if ps | grep $DAEMON; then
+			echo "$NAME is already running... "
+			exit 0
+		fi
+		echo -n "Starting $DESC: $NAME... "
+		$DAEMON $OPTIONS
+		status
+		;;
+	*)
+		echo ""
+		echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop]"
+		echo ""
+		exit 1
+		;;
 esac
 
 exit 0