aboutsummaryrefslogtreecommitdiff
path: root/sh/functions.sh.in
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2008-03-27 16:53:22 +0000
committerRoy Marples <roy@marples.name>2008-03-27 16:53:22 +0000
commitb3d1182a2f233d49e07de35eeab9506fa5892c05 (patch)
tree12bdc32aa0baad4c45f7e4337adaff245f6fc4d0 /sh/functions.sh.in
parentf6cb321f9f01cd0d6380c931f7b2f379dd4c9d82 (diff)
Fix mulitlib issues.
Diffstat (limited to 'sh/functions.sh.in')
-rw-r--r--sh/functions.sh.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/sh/functions.sh.in b/sh/functions.sh.in
index 1a1fbba6..7575d9c2 100644
--- a/sh/functions.sh.in
+++ b/sh/functions.sh.in
@@ -43,7 +43,7 @@ _sanitize_path()
local IFS=":" p= path=
for p in ${PATH}; do
case "${p}" in
- @PREFIX@/lib/rc/sbin|@PREFIX@/bin|@PREFIX@/sbin|/usr/bin|/usr/sbin);;
+ @PREFIX@/@LIB@/rc/sbin|@PREFIX@/bin|@PREFIX@/sbin|/usr/bin|/usr/sbin);;
@PKG_PREFIX@/bin|@PKG_PREFIX@/sbin);;
@LOCAL_PREFIX@/bin|@LOCAL_PREFIX@/sbin);;
*) path="${path}${path:+:}${p}";;
@@ -66,7 +66,7 @@ _PREFIX=@PREFIX@
_PKG_PREFIX=@PKG_PREFIX@
_LOCAL_PREFIX=@LOCAL_PREFIX@
_LOCAL_PREFIX=${_LOCAL_PREFIX:-/usr/local}
-_PATH=@PREFIX@/lib/rc/bin
+_PATH=@PREFIX@/@LIB@/rc/bin
case "${_PREFIX}" in
"${_PKG_PREFIX}"|"${_LOCAL_PREFIX}") ;;
*) _PATH="${_PATH}:${_PREFIX}/bin:${_PREFIX}/sbin";;
@@ -99,7 +99,7 @@ else
# the last ecmd
for _e in ebegin eend error errorn einfo einfon ewarn ewarnn ewend \
vebegin veend veinfo vewarn vewend; do
- eval "${_e}() { local _r; @PREFIX@/lib/rc/bin/${_e} \"\$@\"; _r=$?; \
+ eval "${_e}() { local _r; @PREFIX@/@LIB@/rc/bin/${_e} \"\$@\"; _r=$?; \
export EINFO_LASTCMD=${_e}; return \$_r; }"
done
unset _e