summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2013-02-11 22:13:29 -0500
committerWilliam Hubbs <w.d.hubbs@gmail.com>2013-02-16 20:46:34 -0600
commit414ef6466187c1452b97b69f946cdd150eaa465d (patch)
tree798094b2a0ee80a83143b978b94e81e2bd213c80
parentcd4becf6cd9611defda298f984efa01c441723d3 (diff)
downloadopenrc-414ef6466187c1452b97b69f946cdd150eaa465d.tar.gz
openrc-414ef6466187c1452b97b69f946cdd150eaa465d.tar.bz2
openrc-414ef6466187c1452b97b69f946cdd150eaa465d.tar.xz
disable default -prefix services if MKPREFIX = yes
Certain services were not being enabled by default if PREFIX was set. This appears to have been intended for Gentoo Prefix systems which are indicated by MKPREFIX not PREFIX. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
-rw-r--r--runlevels/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/runlevels/Makefile b/runlevels/Makefile
index e459d15..7bcf29f 100644
--- a/runlevels/Makefile
+++ b/runlevels/Makefile
@@ -53,7 +53,7 @@ install:
if ! test -d "${SYSINITDIR}"; then \
${INSTALL} -d ${SYSINITDIR} || exit $$?; \
for x in ${SYSINIT}; do \
- if test -n "${PREFIX}"; then \
+ if test "${MKPREFIX}" = yes; then \
grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \
fi; \
ln -snf ${INITDIR}/"$$x" ${SYSINITDIR}/"$$x" || exit $$?; done \
@@ -61,7 +61,7 @@ install:
if ! test -d "${BOOTDIR}"; then \
${INSTALL} -d ${BOOTDIR} || exit $$?; \
for x in ${BOOT}; do \
- if test -n "${PREFIX}"; then \
+ if test "${MKPREFIX}" = yes; then \
grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \
fi; \
ln -snf ${INITDIR}/"$$x" ${BOOTDIR}/"$$x" || exit $$?; \
@@ -70,7 +70,7 @@ install:
if ! test -d "${DEFAULTDIR}"; then \
${INSTALL} -d ${DEFAULTDIR} || exit $$?; \
for x in ${DEFAULT}; do \
- if test -n "${PREFIX}"; then \
+ if test "${MKPREFIX}" = yes; then \
grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \
fi; \
ln -snf ${INITDIR}/"$$x" ${DEFAULTDIR}/"$$x" || exit $$?; done \
@@ -78,7 +78,7 @@ install:
if ! test -d "${SHUTDOWNDIR}"; then \
${INSTALL} -d ${SHUTDOWNDIR} || exit $$?; \
for x in ${SHUTDOWN}; do \
- if test -n "${PREFIX}"; then \
+ if test "${MKPREFIX}" = yes; then \
grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \
fi; \
ln -snf ${INITDIR}/"$$x" ${SHUTDOWNDIR}/"$$x" || exit $$?; done \