From e2169c9782d4578b0b230f5048c6f281c062be7c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 24 Dec 2009 01:38:32 +0100 Subject: [PATCH] xbps{,-devel}: simplify. --HG-- extra : convert_revision : b3ef6fe9a2c6e765a639a3910351ac23c5fcaa2f --- srcpkgs/xbps-devel/template | 4 ++-- srcpkgs/xbps-devel/xbps-devel-static.template | 2 ++ srcpkgs/xbps/template | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xbps-devel/template b/srcpkgs/xbps-devel/template index e141c015f3c..df2d1a29081 100644 --- a/srcpkgs/xbps-devel/template +++ b/srcpkgs/xbps-devel/template @@ -2,8 +2,8 @@ pkgname=xbps-devel version="$(date +%Y%m%d)" build_style=gnu_makefile -make_build_args="DESTDIR=$XBPS_DESTDIR/$pkgname-$version PREFIX=" -make_install_args="DESTDIR=$XBPS_DESTDIR/$pkgname-$version PREFIX=" +make_build_args="PREFIX=" +make_install_args="PREFIX=" short_desc="The XBPS package system (development branch)" maintainer="Juan RP " long_desc=" diff --git a/srcpkgs/xbps-devel/xbps-devel-static.template b/srcpkgs/xbps-devel/xbps-devel-static.template index 37139711eeb..b2e21a5d45f 100644 --- a/srcpkgs/xbps-devel/xbps-devel-static.template +++ b/srcpkgs/xbps-devel/xbps-devel-static.template @@ -6,6 +6,8 @@ long_desc="${long_desc} This package contains the static binaries and library, that can be used on any GNU/Linux distribution matching the architecture." +replaces="xbps-static" + do_install() { mkdir -p ${DESTDIR}/sbin ${DESTDIR}/usr/lib diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index 3879a3b1cf8..3f2eeae8a0f 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -3,8 +3,8 @@ pkgname=xbps version=0.3 distfiles="http://launchpad.net/xbps/head/$version/+download/xbps-$version.tar.gz" build_style=gnu_makefile -make_build_args="DESTDIR=$XBPS_DESTDIR/$pkgname-$version PREFIX=" -make_install_args="DESTDIR=$XBPS_DESTDIR/$pkgname-$version PREFIX=" +make_build_args="PREFIX=" +make_install_args="PREFIX=" short_desc="The XBPS package system utilities" maintainer="Juan RP " checksum=ba9b1964779c78351241a71dc11f5c5a7323c53dd9387adce261cf1d0eb241cf