diff --git a/xbps-src/libexec/doinst-helper.sh.in b/xbps-src/libexec/doinst-helper.sh.in index 5382f66f71..4edcd3e957 100644 --- a/xbps-src/libexec/doinst-helper.sh.in +++ b/xbps-src/libexec/doinst-helper.sh.in @@ -26,7 +26,11 @@ PKG_TMPLNAME="$1" -. @@XBPS_INSTALL_ETCDIR@@/xbps-src.conf +if [ -n "${CONFIG_FILE}" -a -r "${CONFIG_FILE}" ]; then + . ${CONFIG_FILE} +else + . @@XBPS_INSTALL_ETCDIR@@/xbps-src.conf +fi if [ -n "${MASTERDIR}" ]; then export XBPS_MASTERDIR="${MASTERDIR}" diff --git a/xbps-src/shutils/pkgtarget_funcs.sh.in b/xbps-src/shutils/pkgtarget_funcs.sh.in index 98a6689dbf..c4660c04df 100644 --- a/xbps-src/shutils/pkgtarget_funcs.sh.in +++ b/xbps-src/shutils/pkgtarget_funcs.sh.in @@ -90,6 +90,7 @@ install_pkg() env xbps_machine=${xbps_machine} MASTERDIR=${_MASTERDIR} \ wrksrc=${wrksrc} \ BOOTSTRAP_PKG_REBUILD=$BOOTSTRAP_PKG_REBUILD \ + CONFIG_FILE=${XBPS_CONFIG_FILE} \ ${fakeroot_cmd} ${fakeroot_cmd_args} \ @@XBPS_INSTALL_LIBEXECDIR@@/doinst-helper \ ${curpkgn} || return $?