diff options
| author | Roy Marples <roy@marples.name> | 2008-03-27 16:53:22 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-03-27 16:53:22 +0000 |
| commit | b3d1182a2f233d49e07de35eeab9506fa5892c05 (patch) | |
| tree | 12bdc32aa0baad4c45f7e4337adaff245f6fc4d0 /sh/rc-functions.sh.in | |
| parent | f6cb321f9f01cd0d6380c931f7b2f379dd4c9d82 (diff) | |
| download | openrc-b3d1182a2f233d49e07de35eeab9506fa5892c05.tar.gz openrc-b3d1182a2f233d49e07de35eeab9506fa5892c05.tar.bz2 openrc-b3d1182a2f233d49e07de35eeab9506fa5892c05.tar.xz | |
Fix mulitlib issues.
Diffstat (limited to 'sh/rc-functions.sh.in')
| -rw-r--r-- | sh/rc-functions.sh.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in index 74db71e..f449783 100644 --- a/sh/rc-functions.sh.in +++ b/sh/rc-functions.sh.in @@ -4,15 +4,15 @@ has_addon() { - [ -e "${RC_LIBDIR}/addons/$1.sh" ] || [ -e /lib/rcscripts/addons/"$1".sh ] + [ -e "${RC_LIBDIR}/addons/$1.sh" ] || [ -e /@LIB@/rcscripts/addons/"$1".sh ] } import_addon() { if [ -e "${RC_LIBDIR}/addons/$1.sh" ]; then . "${RC_LIBDIR}/addons/$1.sh" - elif [ -e /lib/rcscripts/addons/"$1".sh ]; then - . /lib/rcscripts/addons/"$1".sh + elif [ -e /@LIB@/rcscripts/addons/"$1".sh ]; then + . /@LIB@/rcscripts/addons/"$1".sh else return 1 fi @@ -75,6 +75,6 @@ get_bootparam() # Add our sbin to $PATH case "${PATH}" in - @PREFIX@/lib/rc/sbin|@PREFIX@/lib/rc/sbin:*);; - *) export PATH="@PREFIX@/lib/rc/sbin:${PATH}";; + "${RC_LIBDIR}"/rc/sbin|"${RC_LIBDIR}"/rc/sbin:*);; + *) export PATH="${RC_LIBDIR}/rc/sbin:${PATH}";; esac |