From 8795076381bc996956d717f54801ce3cc0dfd213 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 18 Nov 2011 11:52:56 +0100 Subject: [PATCH] xbps-src: install_pkg: we know exact PATH for chroot case, use it. --- xbps-src/shutils/pkgtarget_funcs.sh.in | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xbps-src/shutils/pkgtarget_funcs.sh.in b/xbps-src/shutils/pkgtarget_funcs.sh.in index efe0ec4e65..da0e7492e1 100644 --- a/xbps-src/shutils/pkgtarget_funcs.sh.in +++ b/xbps-src/shutils/pkgtarget_funcs.sh.in @@ -129,14 +129,19 @@ install_pkg() fi fi + if [ -n "$IN_CHROOT" ]; then + DOINST_HELPER=/usr/local/libexec/doinst-helper + else + DOINST_HELPER=@@XBPS_INSTALL_LIBEXECDIR@@/doinst-helper + fi + # Install pkg into destdir. env XBPS_MACHINE=${XBPS_MACHINE} wrksrc=${wrksrc} \ MASTERDIR="${XBPS_MASTERDIR}" \ BOOTSTRAP_PKG_REBUILD=$BOOTSTRAP_PKG_REBUILD \ CONFIG_FILE=${XBPS_CONFIG_FILE} \ ${FAKEROOT_CMD} ${FAKEROOT_CMD_ARGS} \ - @@XBPS_INSTALL_LIBEXECDIR@@/doinst-helper \ - ${curpkgn} || return $? + ${DOINST_HELPER} ${curpkgn} || return $? # Strip binaries/libraries. strip_files