aboutsummaryrefslogtreecommitdiff
path: root/sh/functions.sh.in
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2009-05-29 14:15:12 +0100
committerRoy Marples <roy@marples.name>2009-05-29 14:15:12 +0100
commit83e82c452e89bf27de2a7b01bc2356c9050b2a18 (patch)
treea4f8843c7c02a6b51abb06a16f0a9a6665facc71 /sh/functions.sh.in
parent9c5faf231ccf50695270034ab63f747fa2bef1d7 (diff)
parenta518d34549fd80268e9c70d2300808b63c54825c (diff)
Merge branch 'master' of ssh://roy.marples.name/var/git/openrc
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 3f4a15ac..da2e51a9 100644
--- a/sh/functions.sh.in
+++ b/sh/functions.sh.in
@@ -47,7 +47,7 @@ _sanitize_path()
local IFS=":" p= path=
for p in $PATH; do
case "$p" in
- @PREFIX@/@LIB@/rc/bin|@PREFIX@/@LIB@/rc/sbin);;
+ @LIBEXECDIR@/bin|@LIBEXECDIR@/sbin);;
@PREFIX@/bin|@PREFIX@/sbin|/usr/bin|/usr/sbin);;
@PKG_PREFIX@/bin|@PKG_PREFIX@/sbin);;
@LOCAL_PREFIX@/bin|@LOCAL_PREFIX@/sbin);;
@@ -70,7 +70,7 @@ _PREFIX=@PREFIX@
_PKG_PREFIX=@PKG_PREFIX@
_LOCAL_PREFIX=@LOCAL_PREFIX@
_LOCAL_PREFIX=${_LOCAL_PREFIX:-/usr/local}
-_PATH=@PREFIX@/@LIB@/rc/bin
+_PATH=@LIBEXECDIR@/bin
case "$_PREFIX" in
"$_PKG_PREFIX"|"$_LOCAL_PREFIX") ;;
*) _PATH="$_PATH:$_PREFIX/bin:$_PREFIX/sbin";;
@@ -104,7 +104,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; @LIBEXECDIR@/bin/$_e \"\$@\"; _r=$?; \
export EINFO_LASTCMD=$_e; return \$_r; }"
done
unset _e