aboutsummaryrefslogtreecommitdiff
path: root/runlevels
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2012-09-29 10:49:48 -0400
committerWilliam Hubbs <w.d.hubbs@gmail.com>2012-10-05 14:27:00 -0500
commitda842085ce3d9a8c32fdaecabefd6fd2ab123cc0 (patch)
tree5a9cafeb8acd5f24027623009e502dbc86214edb /runlevels
parent18bdbb68709280407ddb0c9443e033f178f1e5a3 (diff)
Fix default runlevel symlink paths
runlevels/Makefile currently uses ${PREFIX} when creating the initial runlevel symlinks, but the init files are installed to ${INITDIR}, which results in broken symlinks if ${SYSCONFDIR} is set to something other than ${PREFIX}/etc Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Diffstat (limited to 'runlevels')
-rw-r--r--runlevels/Makefile18
1 files changed, 9 insertions, 9 deletions
diff --git a/runlevels/Makefile b/runlevels/Makefile
index e78e2d19..a4fd006f 100644
--- a/runlevels/Makefile
+++ b/runlevels/Makefile
@@ -14,7 +14,7 @@ ifeq (${MKNET},)
BOOT+= network staticroute
endif
-INITDIR= ../init.d
+INITFILES= ../init.d
MK= ../mk
include ${MK}/sys.mk
@@ -54,34 +54,34 @@ install:
${INSTALL} -d ${SYSINITDIR} || exit $$?; \
for x in ${SYSINIT}; do \
if test -n "${PREFIX}"; then \
- grep -q "keyword .*-prefix" ${INITDIR}/"$$x" && continue; \
+ grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \
fi; \
- ln -snf ${PREFIX}/etc/init.d/"$$x" ${SYSINITDIR}/"$$x" || exit $$?; done \
+ ln -snf ${INITDIR}/"$$x" ${SYSINITDIR}/"$$x" || exit $$?; done \
fi
if ! test -d "${BOOTDIR}"; then \
${INSTALL} -d ${BOOTDIR} || exit $$?; \
for x in ${BOOT}; do \
if test -n "${PREFIX}"; then \
- grep -q "keyword .*-prefix" ${INITDIR}/"$$x" && continue; \
+ grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \
fi; \
- ln -snf ${PREFIX}/etc/init.d/"$$x" ${BOOTDIR}/"$$x" || exit $$?; \
+ ln -snf ${INITDIR}/"$$x" ${BOOTDIR}/"$$x" || exit $$?; \
done \
fi
if ! test -d "${DEFAULTDIR}"; then \
${INSTALL} -d ${DEFAULTDIR} || exit $$?; \
for x in ${DEFAULT}; do \
if test -n "${PREFIX}"; then \
- grep -q "keyword .*-prefix" ${INITDIR}/"$$x" && continue; \
+ grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \
fi; \
- ln -snf ${PREFIX}/etc/init.d/"$$x" ${DEFAULTDIR}/"$$x" || exit $$?; done \
+ ln -snf ${INITDIR}/"$$x" ${DEFAULTDIR}/"$$x" || exit $$?; done \
fi
if ! test -d "${SHUTDOWNDIR}"; then \
${INSTALL} -d ${SHUTDOWNDIR} || exit $$?; \
for x in ${SHUTDOWN}; do \
if test -n "${PREFIX}"; then \
- grep -q "keyword .*-prefix" ${INITDIR}/"$$x" && continue; \
+ grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \
fi; \
- ln -snf ${PREFIX}/etc/init.d/"$$x" ${SHUTDOWNDIR}/"$$x" || exit $$?; done \
+ ln -snf ${INITDIR}/"$$x" ${SHUTDOWNDIR}/"$$x" || exit $$?; done \
fi
check test::