From b342d1ee853d029f23601fd1cfcf5f0356b285dc Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 7 Mar 2012 12:53:16 +0100 Subject: [PATCH] xbps-devel: install to /usr; needs which to build. --- srcpkgs/xbps-devel/template | 3 ++- srcpkgs/xbps-devel/xbps-devel-static.template | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xbps-devel/template b/srcpkgs/xbps-devel/template index 6ba99f7fb6..010705aaec 100644 --- a/srcpkgs/xbps-devel/template +++ b/srcpkgs/xbps-devel/template @@ -2,7 +2,7 @@ pkgname=xbps-devel version="$(date -u +%Y%m%d)" build_style=configure -configure_args="--prefix=/ --exec-prefix=/usr --with-pie" +configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin --with-pie" short_desc="The XBPS package system (development branch)" maintainer="Juan RP " homepage="http://code.google.com/p/xbps" @@ -23,6 +23,7 @@ noextract=yes Add_dependency run xbps-triggers Add_dependency build git +Add_dependency build which Add_dependency build pkg-config Add_dependency build zlib-devel Add_dependency build proplib-devel diff --git a/srcpkgs/xbps-devel/xbps-devel-static.template b/srcpkgs/xbps-devel/xbps-devel-static.template index 52dd819d6f..80e04dfe47 100644 --- a/srcpkgs/xbps-devel/xbps-devel-static.template +++ b/srcpkgs/xbps-devel/xbps-devel-static.template @@ -11,10 +11,9 @@ replaces="xbps-static>=0" Add_dependency run xbps-triggers -do_install() -{ +do_install() { vmove usr/include usr - vmove "sbin/*.static" sbin + vmove "usr/sbin/*.static" usr/sbin vmove "usr/lib/*.a" usr/lib vmove usr/lib/pkgconfig usr/lib }