diff options
| author | William Hubbs <w.d.hubbs@gmail.com> | 2012-09-20 16:04:48 -0500 |
|---|---|---|
| committer | William Hubbs <w.d.hubbs@gmail.com> | 2012-09-20 16:04:48 -0500 |
| commit | 0a132cdca508db86a62452dec081b316db880485 (patch) | |
| tree | c06147465e1ef591908c561a5a7b277654f4facf | |
| parent | a0fe1c5a6082c751b570dc1db7dd32b914ebe5cd (diff) | |
| download | openrc-0a132cdca508db86a62452dec081b316db880485.tar.gz openrc-0a132cdca508db86a62452dec081b316db880485.tar.bz2 openrc-0a132cdca508db86a62452dec081b316db880485.tar.xz | |
fix RC_SVCDIR on prefix systems
On prefix systems, RC_SVCDIR was being defined based on the host
operating system. This is not correct because there will not be a /run
directory in a prefix.
This commit moves RC_SVCDIR on prefix systems to the same location as on
non-Linux systems.
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | src/librc/rc.h.in | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -30,7 +30,9 @@ include ${MK}/dist.mk include ${MK}/git.mk _installafter: -ifneq ($(OS),Linux) +ifeq (${MKPREFIX},yes) + ${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/init.d + else ifneq (${OS},Linux) ${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/init.d endif ${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/tmp diff --git a/src/librc/rc.h.in b/src/librc/rc.h.in index 32dbef0..b5a87b5 100644 --- a/src/librc/rc.h.in +++ b/src/librc/rc.h.in @@ -37,7 +37,9 @@ __BEGIN_DECLS #define RC_SYSCONFDIR "@SYSCONFDIR@" #define RC_LIBDIR "@PREFIX@/@LIB@/rc" #define RC_LIBEXECDIR "@LIBEXECDIR@" -#ifdef __linux__ +#if defined(PREFIX) +#define RC_SVCDIR RC_LIBEXECDIR "/init.d" +#elif defined(__linux__) #define RC_SVCDIR "@PREFIX@/run/openrc" #else #define RC_SVCDIR RC_LIBEXECDIR "/init.d" |