wok rev 5093

improve rp-pppoe receipt
author Rohit Joshi <jozee@slitaz.org>
date Mon Mar 15 14:12:19 2010 +0000 (2010-03-15)
parents b315a2103f94
children c96e79a1ca3e
files rp-pppoe/receipt
line diff
     1.1 --- a/rp-pppoe/receipt	Mon Mar 15 14:00:30 2010 +0000
     1.2 +++ b/rp-pppoe/receipt	Mon Mar 15 14:12:19 2010 +0000
     1.3 @@ -15,41 +15,20 @@
     1.4  {
     1.5  	cd $src/src
     1.6  	./configure --prefix=/usr --infodir=/usr/share/info \
     1.7 -	--mandir=/usr/share/man $CONFIGURE_ARGS &&
     1.8 -	make
     1.9 +	--mandir=/usr/share/man \
    1.10 +	$CONFIGURE_ARGS &&
    1.11 +	make &&
    1.12 +	make DESTDIR=$PWD/../_pkg install
    1.13  }
    1.14  
    1.15  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.16  genpkg_rules()
    1.17  {
    1.18 -	mkdir -p $fs/usr/sbin
    1.19 -	cp -a $src/src/pppoe $fs/usr/sbin
    1.20 -	cp -a $src/src/pppoe-server $fs/usr/sbin
    1.21 -	cp -a $src/src/pppoe-relay $fs/usr/sbin
    1.22 -	cp -a $src/src/pppoe-sniff $fs/usr/sbin
    1.23 +	mkdir -p $fs/usr
    1.24  	
    1.25 -	#
    1.26 -	# BUG
    1.27 -	#cp $src/scripts/pppoe-setup $fs/usr/sbin
    1.28 -	cp stuff/pppoe-setup $fs/usr/sbin
    1.29 -	
    1.30 -	# Scripts to /usr/sbin.
    1.31 -	#
    1.32 -	cp $src/scripts/pppoe-connect $fs/usr/sbin
    1.33 -	cp $src/scripts/pppoe-start $fs/usr/sbin
    1.34 -	cp $src/scripts/pppoe-status $fs/usr/sbin
    1.35 -	cp $src/scripts/pppoe-stop $fs/usr/sbin
    1.36 -	sed -i 's|/usr/bin/id|id|' $fs/usr/sbin/pppoe-connect \
    1.37 -		$fs/usr/sbin/pppoe-setup $fs/usr/sbin/pppoe-start
    1.38 -	# Config
    1.39 -	mkdir -p $fs/etc/ppp/plugins
    1.40 -	cp $src/configs/pppoe.conf $fs/etc/ppp
    1.41 -	cp $src/configs/firewall-standalone $fs/etc/ppp
    1.42 -	cp $src/configs/firewall-masq $fs/etc/ppp
    1.43 -	cp $src/configs/pppoe-server-options $fs/etc/ppp
    1.44 -	echo "# Directory created by rp-pppoe for kernel-mode plugin" > \
    1.45 -		$fs/etc/ppp/plugins/README
    1.46 -	
    1.47 +	cp -a $_pkg/etc $fs
    1.48 +	cp -a $_pkg/usr/sbin $fs/usr	
    1.49 +
    1.50  	# Fix permissions on all scripts
    1.51  	chmod -R 755 $fs/usr/sbin/*
    1.52  }