wok-4.x diff hostapd/receipt @ rev 8951

Merge
author Christopher Rogers <slaxemulator@gmail.com>
date Tue Mar 01 17:37:51 2011 +0000 (2011-03-01)
parents af022550edde
children b05d31223509
line diff
     1.1 --- a/hostapd/receipt	Sun Oct 31 23:30:12 2010 +0100
     1.2 +++ b/hostapd/receipt	Tue Mar 01 17:37:51 2011 +0000
     1.3 @@ -15,28 +15,30 @@
     1.4  compile_rules()
     1.5  {
     1.6  	cp -a stuff/config $src/hostapd/.config
     1.7 -	mkdir -p $src/_pkg/usr/bin
     1.8 +	mkdir -p $DESTDIR/usr/bin
     1.9  
    1.10  	cd $src/hostapd
    1.11  
    1.12 -	sed -i "s|/usr/local/bin|$src/_pkg/usr/bin|" Makefile
    1.13 +	sed -i "s|/usr/local/bin|$DESTDIR/usr/bin|" Makefile
    1.14  	
    1.15 -	make && make DESTDIR=$PWD/_pkg install
    1.16 +	make && make DESTDIR=$DESTDIR install
    1.17 +
    1.18 +	[ -d $DESTDIR/etc/hostapd ] || mkdir -p $DESTDIR/etc/hostapd
    1.19 +	cp -a $src/hostapd/hostapd.accept $src/hostapd/hostapd.conf \
    1.20 +		$src/hostapd/hostapd.deny $src/hostapd/hostapd.eap_user \
    1.21 +		$src/hostapd/hostapd.radius_clients $src/hostapd/hostapd.sim_db \
    1.22 +		$src/hostapd/hostapd.vlan $src/hostapd/hostapd.wpa_psk \
    1.23 +		$src/hostapd/wired.conf $src/hostapd/hlr_auc_gw.milenage_db \
    1.24 +		$DESTDIR/etc/hostapd
    1.25 +
    1.26  }
    1.27  
    1.28  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.29  genpkg_rules()
    1.30  {
    1.31 -	mkdir -p $fs/usr $fs/etc/hostapd $fs/etc/init.d
    1.32 +	mkdir -p $fs/usr $fs/etc/init.d
    1.33  
    1.34  	cp -a $_pkg/usr/bin $fs/usr
    1.35  
    1.36 -	cp -a $src/hostapd/hostapd.accept $src/hostapd/hostapd.conf \
    1.37 -		$src/hostapd/hostapd.deny $src/hostapd/hostapd.eap_user \
    1.38 -		$src/hostapd/hostapd.radius_clients $src/hostapd/hostapd.sim_db \
    1.39 -		$src/hostapd/hostapd.vlan $src/hostapd/hostapd.wpa_psk \
    1.40 -		$src/hostapd/wired.conf $src/src/hlr_auc_gw/hlr_auc_gw.milenage_db \
    1.41 -		$fs/etc/hostapd
    1.42 -
    1.43  	cp -a stuff/hostapd $fs/etc/init.d
    1.44  }