# HG changeset patch
# User Rohit Joshi <jozee@slitaz.org>
# Date 1268751978 0
# Node ID 7b74d9bf8919d97eae161f8bdb00554cb0e95f89
# Parent  ce752ae970e1a0985dc342d42f03b86e4a363724
improve rp-pppoe (recommit)

diff -r ce752ae970e1 -r 7b74d9bf8919 rp-pppoe/receipt
--- a/rp-pppoe/receipt	Tue Mar 16 15:03:50 2010 +0000
+++ b/rp-pppoe/receipt	Tue Mar 16 15:06:18 2010 +0000
@@ -15,41 +15,20 @@
 {
 	cd $src/src
 	./configure --prefix=/usr --infodir=/usr/share/info \
-	--mandir=/usr/share/man $CONFIGURE_ARGS &&
-	make
+	--mandir=/usr/share/man \
+	$CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$PWD/../_pkg install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/sbin
-	cp -a $src/src/pppoe $fs/usr/sbin
-	cp -a $src/src/pppoe-server $fs/usr/sbin
-	cp -a $src/src/pppoe-relay $fs/usr/sbin
-	cp -a $src/src/pppoe-sniff $fs/usr/sbin
+	mkdir -p $fs/usr
 	
-	#
-	# BUG
-	#cp $src/scripts/pppoe-setup $fs/usr/sbin
-	cp stuff/pppoe-setup $fs/usr/sbin
-	
-	# Scripts to /usr/sbin.
-	#
-	cp $src/scripts/pppoe-connect $fs/usr/sbin
-	cp $src/scripts/pppoe-start $fs/usr/sbin
-	cp $src/scripts/pppoe-status $fs/usr/sbin
-	cp $src/scripts/pppoe-stop $fs/usr/sbin
-	sed -i 's|/usr/bin/id|id|' $fs/usr/sbin/pppoe-connect \
-		$fs/usr/sbin/pppoe-setup $fs/usr/sbin/pppoe-start
-	# Config
-	mkdir -p $fs/etc/ppp/plugins
-	cp $src/configs/pppoe.conf $fs/etc/ppp
-	cp $src/configs/firewall-standalone $fs/etc/ppp
-	cp $src/configs/firewall-masq $fs/etc/ppp
-	cp $src/configs/pppoe-server-options $fs/etc/ppp
-	echo "# Directory created by rp-pppoe for kernel-mode plugin" > \
-		$fs/etc/ppp/plugins/README
-	
+	cp -a $_pkg/etc $fs
+	cp -a $_pkg/usr/sbin $fs/usr	
+
 	# Fix permissions on all scripts
 	chmod -R 755 $fs/usr/sbin/*
 }