jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

xbps-src: install_pkg: we know exact PATH for chroot case, use it.

Browse source
This commit is contained in:
Juan RP 2011-11-18 11:52:56 +01:00
parent b1210b9934
commit 8795076381
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
xbps-src/shutils/pkgtarget_funcs.sh.in
View file

@ -129,14 +129,19 @@ install_pkg()
fi fi
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. # Install pkg into destdir.
env XBPS_MACHINE=${XBPS_MACHINE} wrksrc=${wrksrc} \ env XBPS_MACHINE=${XBPS_MACHINE} wrksrc=${wrksrc} \
MASTERDIR="${XBPS_MASTERDIR}" \ MASTERDIR="${XBPS_MASTERDIR}" \
BOOTSTRAP_PKG_REBUILD=$BOOTSTRAP_PKG_REBUILD \ BOOTSTRAP_PKG_REBUILD=$BOOTSTRAP_PKG_REBUILD \
CONFIG_FILE=${XBPS_CONFIG_FILE} \ CONFIG_FILE=${XBPS_CONFIG_FILE} \
${FAKEROOT_CMD} ${FAKEROOT_CMD_ARGS} \ ${FAKEROOT_CMD} ${FAKEROOT_CMD_ARGS} \
@@XBPS_INSTALL_LIBEXECDIR@@/doinst-helper \ ${DOINST_HELPER} ${curpkgn} || return $?
${curpkgn} || return $?
# Strip binaries/libraries. # Strip binaries/libraries.
strip_files strip_files