wok diff karmen/receipt @ rev 15480

memtest: default setup size = 4
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Nov 10 11:19:32 2013 +0000 (2013-11-10)
parents 08943259e85e
children 23c3aed67cd9
line diff
     1.1 --- a/karmen/receipt	Tue May 05 02:12:07 2009 +0200
     1.2 +++ b/karmen/receipt	Sun Nov 10 11:19:32 2013 +0000
     1.3 @@ -8,28 +8,30 @@
     1.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
     1.5  WEB_SITE="http://karmen.sourceforge.net/"
     1.6  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
     1.7 -DEPENDS="xorg-libX11 xorg-xsetroot wbar"
     1.8 +TAGS="wm window-manager"
     1.9 +
    1.10 +DEPENDS="xorg-libX11 xorg-xsetroot nano xterm xorg-xclock dialog"
    1.11  BUILD_DEPENDS="xorg-libX11-dev"
    1.12 -TAGS="wm window-manager"
    1.13  
    1.14  # Rules to configure and make the package.
    1.15  compile_rules()
    1.16  {
    1.17  	cd $src
    1.18 -	./configure --prefix=/usr &&
    1.19 -	make &&
    1.20 -	make DESTDIR=$PWD/_pkg install
    1.21 +	./configure --prefix=/usr \
    1.22 +		$CONFIGURE_ARGS &&
    1.23 +	make && make install
    1.24  }
    1.25  
    1.26  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.27  genpkg_rules()
    1.28  {
    1.29 -	mkdir -p $fs/usr
    1.30 +	mkdir -p $fs/usr/share
    1.31  	cp -a $_pkg/usr/bin $fs/usr
    1.32  	# Custom configuration and scripts.
    1.33 -	cp -a stuff/karmen-session $fs/usr/bin
    1.34 -	cp -a stuff/karmen-conf $fs/usr/bin
    1.35 -	cp -a stuff/etc $fs
    1.36 +	install -m 0755 $stuff/karmen-session $fs/usr/bin
    1.37 +	install -m 0755 $stuff/karmen-conf $fs/usr/bin
    1.38 +	cp -a $stuff/xsessions $fs/usr/share
    1.39 +	cp -a $stuff/etc $fs
    1.40  	chown 0.0 $fs/usr/bin/*
    1.41  }
    1.42  
    1.43 @@ -39,7 +41,7 @@
    1.44  	# Adding WM to SLIM available sessions.
    1.45  	if ! echo "$res" | grep -q $PACKAGE; then
    1.46  		echo -n "Adding $PACKAGE to /etc/slim.conf..."
    1.47 -		sed -i "s/^sessions.*/sessions            ${res},$PACKAGE/" /etc/slim.conf
    1.48 +		sed -i "s/^sessions.*/sessions            ${res},$PACKAGE/" $1/etc/slim.conf
    1.49  		status
    1.50  	fi
    1.51  }