aboutsummaryrefslogtreecommitdiff
path: root/sh
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2008-03-25 18:33:45 +0000
committerRoy Marples <roy@marples.name>2008-03-25 18:33:45 +0000
commit5866d829bb4c3352056e2c6775efe71f299ee120 (patch)
tree81e25c55594cdbf114c4d22087ea1b7c27571793 /sh
parent068c90c82b07343b5f54fe5ac836fe3efc66f51f (diff)
Try and fix more prefix stuff.
Diffstat (limited to 'sh')
-rw-r--r--sh/gendepends.sh.in10
-rw-r--r--sh/runscript.sh.in4
2 files changed, 7 insertions, 7 deletions
diff --git a/sh/gendepends.sh.in b/sh/gendepends.sh.in
index 8ab50ad2..806c79bb 100644
--- a/sh/gendepends.sh.in
+++ b/sh/gendepends.sh.in
@@ -4,7 +4,7 @@
# Copyright 2007-2008 Roy Marples <roy@marples.name>
# All rights reserved. Released under the 2-clause BSD license.
-. @PREFIX@/@SYSCONFDIR@/init.d/functions.sh
+. @SYSCONFDIR@/init.d/functions.sh
config() {
[ -n "$*" ] && echo "${RC_SVCNAME} config $*" >&3
@@ -33,9 +33,9 @@ depend() {
_done_dirs=
for _dir in \
-@PREFIX@/@SYSCONFDIR@/init.d \
-@PKG_PREFIX@/@SYSCONFDIR@/init.d \
-@LOCAL_PREFIX@/@SYSCONFDIR@/init.d
+@SYSCONFDIR@/init.d \
+@PKG_PREFIX@/etc/init.d \
+@LOCAL_PREFIX@/etc/init.d
do
[ -d "${_dir}" ] || continue
@@ -76,7 +76,7 @@ do
. "${_dir}/../conf.d/${RC_SVCNAME}"
fi
- [ -e @PREFIX@/@SYSCONFDIR@/rc.conf ] && . @PREFIX@/@SYSCONFDIR@/rc.conf
+ [ -e @SYSCONFDIR@/rc.conf ] && . @SYSCONFDIR@/rc.conf
if . "${_dir}/${RC_SVCNAME}"; then
echo "${RC_SVCNAME}" >&3
diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in
index 51777fae..4492888b 100644
--- a/sh/runscript.sh.in
+++ b/sh/runscript.sh.in
@@ -4,7 +4,7 @@
# Copyright 2007-2008 Roy Marples <roy@marples.name>
# All rights reserved. Released under the 2-clause BSD license.
-. @PREFIX@/@SYSCONFDIR@/init.d/functions.sh
+. @SYSCONFDIR@/init.d/functions.sh
. "${RC_LIBDIR}"/sh/rc-functions.sh
# Support LiveCD foo
@@ -67,7 +67,7 @@ fi
unset _conf_d
# Load any system overrides
-[ -e @PREFIX@/@SYSCONFDIR@/rc.conf ] && . @PREFIX@/@SYSCONFDIR@/rc.conf
+[ -e @SYSCONFDIR@/rc.conf ] && . @SYSCONFDIR@/rc.conf
# Apply any ulimit defined
[ -n "${rc_ulimit:-${RC_ULIMIT}}" ] && ulimit ${rc_ulimit:-${RC_ULIMIT}}