diff --git a/xbps-src/shutils/Makefile b/xbps-src/shutils/Makefile index cff7a492006..c9918cb0df7 100644 --- a/xbps-src/shutils/Makefile +++ b/xbps-src/shutils/Makefile @@ -1,6 +1,6 @@ include ../vars.mk -SCRIPTS = chroot.sh init_funcs.sh pkgtarget_funcs.sh +SCRIPTS = tmpl_funcs.sh chroot.sh init_funcs.sh pkgtarget_funcs.sh .PHONY: all all: diff --git a/xbps-src/shutils/tmpl_funcs.sh b/xbps-src/shutils/tmpl_funcs.sh.in similarity index 96% rename from xbps-src/shutils/tmpl_funcs.sh rename to xbps-src/shutils/tmpl_funcs.sh.in index 1792f2aab56..de64addc275 100644 --- a/xbps-src/shutils/tmpl_funcs.sh +++ b/xbps-src/shutils/tmpl_funcs.sh.in @@ -237,13 +237,11 @@ prepare_tmpl() set_tmpl_common_vars if [ -z "$in_chroot" ]; then - local _PATH - _PATH="$XBPS_MASTERDIR/bin:$XBPS_MASTERDIR/sbin" - _PATH="${_PATH}:$XBPS_MASTERDIR/usr/bin" - _PATH="${_PATH}:$XBPS_MASTERDIR/usr/sbin" - _PATH="${_PATH}:/bin:/sbin:/usr/bin:/usr/sbin" - _PATH="${_PATH}:/usr/local/sbin" - export PATH="${_PATH}:${PATH}" + export PATH="$XBPS_MASTERDIR/bin:$XBPS_MASTERDIR/sbin" + export PATH="$PATH:$XBPS_MASTERDIR/usr/bin" + export PATH="$PATH:$XBPS_MASTERDIR/usr/sbin" + export PATH="$PATH:/bin:/sbin:/usr/bin:/usr/sbin" + export PATH="$PATH:/sbin:@@XBPS_INSTALL_PREFIX@@/sbin" fi }