From ee4e861796ad9b19acb45c576ed181ce2fdfebf5 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Fri, 28 Mar 2008 10:46:12 +0000 Subject: Put some dir locations in rc.h so that 3rd party apps can become awware of them. --- src/rc/Makefile | 2 -- src/rc/rc-misc.c | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src/rc') diff --git a/src/rc/Makefile b/src/rc/Makefile index f60fc313..2edc51eb 100644 --- a/src/rc/Makefile +++ b/src/rc/Makefile @@ -39,8 +39,6 @@ include ${MK}/cc.mk include ${MK}/debug.mk CFLAGS+= -I../includes -I../librc -I../libeinfo -CFLAGS+= -DLIB=\"${LIBNAME}\" -CFLAGS+= -DSYSCONFDIR=\"${SYSCONFDIR}\" include ${MK}/${MKTERMCAP}.mk LDADD+= ${LIBDL} ${LIBKVM} diff --git a/src/rc/rc-misc.c b/src/rc/rc-misc.c index afe7893c..6e94ad69 100644 --- a/src/rc/rc-misc.c +++ b/src/rc/rc-misc.c @@ -49,11 +49,11 @@ #include "rc.h" #include "rc-misc.h" -#define PROFILE_ENV SYSCONFDIR "/profile.env" +#define PROFILE_ENV RC_SYSCONFDIR "/profile.env" #define SYS_WHITELIST RC_LIBDIR "/conf.d/env_whitelist" -#define USR_WHITELIST SYSCONFDIR "/conf.d/env_whitelist" -#define RC_CONF SYSCONFDIR "/rc.conf" -#define RC_CONF_OLD SYSCONFDIR "/conf.d/rc" +#define USR_WHITELIST RC_SYSCONFDIR "/conf.d/env_whitelist" +#define RC_CONF RC_SYSCONFDIR "/rc.conf" +#define RC_CONF_OLD RC_SYSCONFDIR "/conf.d/rc" #define PATH_PREFIX RC_LIBDIR "/bin:/bin:/sbin:/usr/bin:/usr/sbin" -- cgit v1.2.3