From b1210b9934b29d07c71cfa7cd19d275c253c8809 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 18 Nov 2011 11:47:24 +0100 Subject: [PATCH] xbps-src: set_defvars: we know exact PATH for chroot case, use it. --- xbps-src/shutils/init_funcs.sh.in | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/xbps-src/shutils/init_funcs.sh.in b/xbps-src/shutils/init_funcs.sh.in index 1ff360ff15..9f34df5d93 100644 --- a/xbps-src/shutils/init_funcs.sh.in +++ b/xbps-src/shutils/init_funcs.sh.in @@ -27,16 +27,20 @@ set_defvars() { local DDIRS i - XBPS_HELPERSDIR=@@XBPS_INSTALL_SHAREDIR@@/helpers - XBPS_SHUTILSDIR=@@XBPS_INSTALL_SHAREDIR@@/shutils - XBPS_COMMONVARSDIR=@@XBPS_INSTALL_SHAREDIR@@/common XBPS_META_PATH=$XBPS_MASTERDIR/var/db/xbps XBPS_PKGMETADIR=$XBPS_META_PATH/metadata XBPS_SRCPKGDIR=$XBPS_DISTRIBUTIONDIR/srcpkgs + if [ -n "$IN_CHROOT" ]; then + XBPS_HELPERSDIR=/usr/local/share/xbps-src/helpers + XBPS_SHUTILSDIR=/usr/local/share/xbps-src/shutils + XBPS_COMMONVARSDIR=/usr/local/share/xbps-src/common XBPS_DESTDIR=/destdir XBPS_BUILDDIR=/builddir else + XBPS_HELPERSDIR=@@XBPS_INSTALL_SHAREDIR@@/helpers + XBPS_SHUTILSDIR=@@XBPS_INSTALL_SHAREDIR@@/shutils + XBPS_COMMONVARSDIR=@@XBPS_INSTALL_SHAREDIR@@/common XBPS_DESTDIR=$XBPS_MASTERDIR/destdir XBPS_BUILDDIR=$XBPS_MASTERDIR/builddir fi