emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix RC_SVCDIR on prefix systems

Browse Source 
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.
This commit is contained in:
William Hubbs 2012-09-20 16:04:48 -05:00
parent a0fe1c5a60
commit 0a132cdca5
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -30,7 +30,9 @@ include ${MK}/dist.mk
include ${MK}/git.mk include ${MK}/git.mk
_installafter: _installafter:
ifneq ($(OS),Linux) ifeq (${MKPREFIX},yes)
${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/init.d
else ifneq (${OS},Linux)
${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/init.d ${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/init.d
endif endif
${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/tmp ${INSTALL} -d ${DESTDIR}/${LIBEXECDIR}/tmp

4
src/librc/rc.h.in
View File

@ -37,7 +37,9 @@ __BEGIN_DECLS
#define RC_SYSCONFDIR "@SYSCONFDIR@" #define RC_SYSCONFDIR "@SYSCONFDIR@"
#define RC_LIBDIR "@PREFIX@/@LIB@/rc" #define RC_LIBDIR "@PREFIX@/@LIB@/rc"
#define RC_LIBEXECDIR "@LIBEXECDIR@" #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" #define RC_SVCDIR "@PREFIX@/run/openrc"
#else #else
#define RC_SVCDIR RC_LIBEXECDIR "/init.d" #define RC_SVCDIR RC_LIBEXECDIR "/init.d"