diff options
| author | Roy Marples <roy@marples.name> | 2009-05-23 20:38:12 +0100 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2009-05-23 20:38:12 +0100 |
| commit | c0fd1b49e49cec28c1f5a3a76f9db11c62e550dc (patch) | |
| tree | fe1f406f976dbcec3d7225ccf1b0f08f6957dfcc /sh/functions.sh.in | |
| parent | 5294abe6171610a1aa0eb093774bed9bb965c9cf (diff) | |
Move non compiled libraries from /lib/rc to /libexec/rc
OpenRC version is now stored as plaintext in /libexec/rc/version
Plugins (cursplash, splashutils) will have to be re-compiled to pickup
the new directories. State data needs to be moved from /lib/rc/init.d
to /libexec/rc/init.d as well.
Diffstat (limited to 'sh/functions.sh.in')
| -rw-r--r-- | sh/functions.sh.in | 6 |
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 |