diff options
| author | Roy Marples <roy@marples.name> | 2008-03-25 18:33:45 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-03-25 18:33:45 +0000 |
| commit | 5866d829bb4c3352056e2c6775efe71f299ee120 (patch) | |
| tree | 81e25c55594cdbf114c4d22087ea1b7c27571793 /src/includes | |
| parent | 068c90c82b07343b5f54fe5ac836fe3efc66f51f (diff) | |
| download | openrc-5866d829bb4c3352056e2c6775efe71f299ee120.tar.gz openrc-5866d829bb4c3352056e2c6775efe71f299ee120.tar.bz2 openrc-5866d829bb4c3352056e2c6775efe71f299ee120.tar.xz | |
Try and fix more prefix stuff.
Diffstat (limited to 'src/includes')
| -rw-r--r-- | src/includes/rc-misc.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/includes/rc-misc.h b/src/includes/rc-misc.h index 81ffbc6..846e8dc 100644 --- a/src/includes/rc-misc.h +++ b/src/includes/rc-misc.h @@ -41,39 +41,39 @@ # define LIB "lib" #endif -#ifndef SYSCONFDIR -# define SYSCONFDIR "/etc" -#endif - #ifdef PREFIX # define RC_PREFIX PREFIX #else # define RC_PREFIX #endif +#ifndef SYSCONFDIR +# define SYSCONFDIR RC_PREFIX "/etc" +#endif + #define RC_LEVEL_BOOT "boot" #define RC_LEVEL_DEFAULT "default" #define RC_LIBDIR RC_PREFIX "/" LIB "/rc" #define RC_SVCDIR RC_LIBDIR "/init.d" #define RC_DEPTREE_CACHE RC_SVCDIR "/deptree" -#define RC_RUNLEVELDIR RC_PREFIX SYSCONFDIR "/runlevels" -#define RC_INITDIR RC_PREFIX SYSCONFDIR "/init.d" -#define RC_CONFDIR RC_PREFIX SYSCONFDIR "/conf.d" +#define RC_RUNLEVELDIR SYSCONFDIR "/runlevels" +#define RC_INITDIR SYSCONFDIR "/init.d" +#define RC_CONFDIR SYSCONFDIR "/conf.d" /* PKG_PREFIX is where packages are installed if different from the base OS * On Gentoo this is normally unset, on FreeBSD /usr/local and on NetBSD * /usr/pkg. */ #ifdef PKG_PREFIX -# define RC_PKG_INITDIR PKG_PREFIX SYSCONFDIR "/init.d" -# define RC_PKG_CONFDIR PKG_PREFIX SYSCONFDIR "/conf.d" +# define RC_PKG_INITDIR PKG_PREFIX "/etc/init.d" +# define RC_PKG_CONFDIR PKG_PREFIX "/etc/conf.d" #endif /* LOCAL_PREFIX is for user written stuff, which the base OS and package * manger don't touch. */ #ifdef LOCAL_PREFIX -# define RC_LOCAL_INITDIR LOCAL_PREFIX SYSCONFDIR "/init.d" -# define RC_LOCAL_CONFDIR LOCAL_PREFIX SYSCONFDIR "/conf.d" +# define RC_LOCAL_INITDIR LOCAL_PREFIX "/etc/init.d" +# define RC_LOCAL_CONFDIR LOCAL_PREFIX "/etc/conf.d" #endif #define RC_KRUNLEVEL RC_SVCDIR "/krunlevel" |