From b046604a946e4d69aeb7bffe71626b263485ad83 Mon Sep 17 00:00:00 2001 From: jlam Date: Mon, 19 Nov 2001 16:01:03 +0000 Subject: Create a new variable CONFDIR that represents the directory where package config files should go. It may be overridden on a per-package basis by defining CONFDIR.${PKGBASE}, e.g. CONFDIR.php. ${CONFDIR} defaults to ${PREFIX}/etc, but it may be overridden in /etc/mk.conf, e.g. by setting CONFDIR=/etc. Packages will eventually be altered to find their config files in ${CONFDIR}. --- mk/bsd.pkg.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 73600a2f606..67856ec9355 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.850 2001/11/16 20:35:19 tron Exp $ +# $NetBSD: bsd.pkg.mk,v 1.851 2001/11/19 16:01:03 jlam Exp $ # # This file is in the public domain. # @@ -64,6 +64,12 @@ PKGDIR?= ${.CURDIR}/pkg PKGDIR?= ${.CURDIR} .endif +.if defined(CONFDIR.${PKGBASE}) +CONFDIR= ${CONFDIR.${PKGBASE}} +.else +CONFDIR?= ${PREFIX}/etc +.endif + .if defined(USE_JAVA) BUILD_DEFS+= PKG_JVM JAVA_HOME . if !defined(PKG_JVM) -- cgit v1.2.3