wok diff vzctl/receipt @ rev 15364

apache: keep httpd name
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Oct 03 16:27:18 2013 +0000 (2013-10-03)
parents b7319995b37e
children 6135577f4d08
line diff
     1.1 --- a/vzctl/receipt	Mon Jan 02 23:06:18 2012 +0100
     1.2 +++ b/vzctl/receipt	Thu Oct 03 16:27:18 2013 +0000
     1.3 @@ -5,12 +5,14 @@
     1.4  CATEGORY="system-tools"
     1.5  SHORT_DESC="OpenVZ containers control utility"
     1.6  MAINTAINER="erjo@slitaz.org"
     1.7 -DEPENDS="udev bash procmail bridge-utils logrotate tar gzip"
     1.8 -BUILD_DEPENDS="sed"
     1.9 +LICENSE="GPL2"
    1.10  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    1.11  WEB_SITE="http://wiki.openvz.org/Main_Page"
    1.12  WGET_URL="http://download.openvz.org/utils/${PACKAGE}/${VERSION}/src/${TARBALL}"
    1.13  
    1.14 +DEPENDS="udev bash procmail bridge-utils logrotate tar gzip"
    1.15 +BUILD_DEPENDS="sed"
    1.16 +
    1.17  # Rules to configure and make the package.
    1.18  compile_rules()
    1.19  {
    1.20 @@ -34,7 +36,7 @@
    1.21  		--enable-bashcomp \
    1.22  		--enable-logrotate \
    1.23  		$CONFIGURE_ARGS &&
    1.24 -	make && make DESTDIR=$PWD/_pkg install && make DESTDIR=$PWD/_pkg install-slitaz
    1.25 +	make && make DESTDIR=$DESTDIR install && make DESTDIR=$DESTDIR install-slitaz
    1.26  }
    1.27  
    1.28  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.29 @@ -43,12 +45,12 @@
    1.30  	mkdir -p $fs/usr/lib \
    1.31  		$fs/usr/share
    1.32  		
    1.33 -	cp -a $_pkg/usr/sbin $fs/usr
    1.34 -	cp -a $_pkg/usr/lib/vzctl $fs/usr/lib
    1.35 -	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
    1.36 -	cp -a $_pkg/etc $fs/
    1.37 -	cp -a $_pkg/var/ $fs/
    1.38 -	cp -a $_pkg/vz/ $fs/
    1.39 +	cp -a $install/usr/sbin $fs/usr
    1.40 +	cp -a $install/usr/lib/vzctl $fs/usr/lib
    1.41 +	cp -a $install/usr/lib/*.so* $fs/usr/lib
    1.42 +	cp -a $install/etc $fs/
    1.43 +	cp -a $install/var/ $fs/
    1.44 +	cp -a $install/vz/ $fs/
    1.45  	
    1.46  	# fix permissions
    1.47  	chmod 0755 $fs/usr/lib/vzctl/scripts/v*