diff options
| author | Roy Marples <roy@marples.name> | 2008-02-28 11:08:49 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-02-28 11:08:49 +0000 |
| commit | f092045650faad778d25d000d80b3128664d2e2a (patch) | |
| tree | 89188e92a4d01423ee59e33e5eaf5355fa14d103 /sh | |
| parent | aabf3976db5ffb41f8f8bbd47f5015b4158e095a (diff) | |
| download | openrc-f092045650faad778d25d000d80b3128664d2e2a.tar.gz openrc-f092045650faad778d25d000d80b3128664d2e2a.tar.bz2 openrc-f092045650faad778d25d000d80b3128664d2e2a.tar.xz | |
Support the use of PREFIX and PKG_PREFIX.
Diffstat (limited to 'sh')
| -rw-r--r-- | sh/Makefile | 4 | ||||
| -rw-r--r-- | sh/functions.sh.in | 4 | ||||
| -rw-r--r-- | sh/rc-functions.sh.in | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sh/Makefile b/sh/Makefile index 364a59b..bda82a0 100644 --- a/sh/Makefile +++ b/sh/Makefile @@ -13,7 +13,7 @@ include ${MK}/scripts.mk _installafter: ${INSTALL} -d ${DESTDIR}/etc/init.d @# Provide an init script for the loopback interface - ln -snf ${RC_LIB}/sh/net.sh ${DESTDIR}/etc/init.d/${NET_LO} || exit $$? + ln -snf ${RC_LIB}/sh/net.sh ${DESTDIR}/${PREFIX}/etc/init.d/${NET_LO} || exit $$? @# Put functions.sh into the init.d dir so 3rd party apps don't have to @# be multilib aware - ln -snf ${RC_LIB}/sh/functions.sh ${DESTDIR}/etc/init.d || exit $$? + ln -snf ${RC_LIB}/sh/functions.sh ${DESTDIR}/${PREFIX}/etc/init.d || exit $$? diff --git a/sh/functions.sh.in b/sh/functions.sh.in index effce67..a68f65f 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 - /lib/rc/sbin|/bin|/sbin|/usr/bin|/usr/sbin|/usr/pkg/bin|/usr/pkg/sbin|/usr/local/bin|/usr/local/sbin);; + @PREFIX@/lib/rc/sbin|/bin|/sbin|/usr/bin|/usr/sbin|@PKG_PREFIX@/bin|@PKG_PREFIX/sbin);; *) path="${path}:${p}";; esac done @@ -60,7 +60,7 @@ if [ -n "${ZSH_VERSION}" ]; then fi # Add our bin to $PATH -export PATH="/lib/rc/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/pkg/bin:/usr/pkg/sbin:/usr/local/bin:/usr/local/sbin$(_sanitize_path "${PATH}")" +export PATH="@PREFIX@/lib/rc/bin:/bin:/sbin:/usr/bin:/usr/sbin:@PKG_PREFIX@/bin:@PKG_PREFIX@/sbin:$(_sanitize_path "${PATH}")" unset _sanitize_path for arg; do diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in index 2a57709..74db71e 100644 --- a/sh/rc-functions.sh.in +++ b/sh/rc-functions.sh.in @@ -75,6 +75,6 @@ get_bootparam() # Add our sbin to $PATH case "${PATH}" in - /lib/rc/sbin|/lib/rc/sbin:*);; - *) export PATH="/lib/rc/sbin:${PATH}";; + @PREFIX@/lib/rc/sbin|@PREFIX@/lib/rc/sbin:*);; + *) export PATH="@PREFIX@/lib/rc/sbin:${PATH}";; esac |