From a689b66023ad7b3da179b02c9e473cbc49f295e6 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Wed, 5 Mar 2008 12:27:11 +0000 Subject: Add tunable SYSCONFDIR --- mk/scripts.mk | 6 ++++-- mk/sys.mk | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'mk') diff --git a/mk/scripts.mk b/mk/scripts.mk index b84f05ef..a77e17e5 100644 --- a/mk/scripts.mk +++ b/mk/scripts.mk @@ -6,13 +6,15 @@ include ${MK}/os.mk OBJS+= ${SRCS:.in=} +_SED_REPLACE= -e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' -e 's:@PREFIX@:${PREFIX}:g' -e 's:@PKG_PREFIX@:${PKG_PREFIX}:g' -e 's:@LOCAL_PREFIX@:${LOCAL_PREFIX}:g' + # Tweak our shell scripts .SUFFIXES: .sh.in .in .sh.in.sh: - sed -e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e 's:@PREFIX@:${PREFIX}:g' -e 's:@PKG_PREFIX@:${PKG_PREFIX}:g' -e 's:@LOCAL_PREFIX@:${LOCAL_PREFIX}:g' $< > $@ + sed ${_SED_REPLACE} $< > $@ .in: - sed -e 's:@PREFIX@:${PREFIX}:g' -e 's:@PKG_PREFIX@:${PKG_PREFIX}:g' -e 's:@LOCAL_PREFIX@:${LOCAL_PREFIX}:g' $< > $@ + sed ${_SED_REPLACE} $< > $@ all: ${OBJS} diff --git a/mk/sys.mk b/mk/sys.mk index 6c132bb3..4be7baea 100644 --- a/mk/sys.mk +++ b/mk/sys.mk @@ -15,6 +15,10 @@ PKG_PREFIX= /usr/local PICFLAG?= -fPIC +SYSCONFDIR?= /etc +INITDIR?= ${SYSCONFDIR}/init.d +CONFDIR?= ${SYSCONFDIR}/conf.d + BINDIR?= ${PREFIX}/sbin BINMODE?= 0755 -- cgit v1.2.3