PKG_SYSCONFDIR is where the configuration files for a package may be found.

This value may be customized in various ways:

PKG_SYSCONFBASE is the main config directory under which all package
	configuration files are to be found.

PKG_SYSCONFSUBDIR is the subdirectory of PKG_SYSCONFBASE under which the
	configuration files for a particular package may be found.

PKG_SYSCONFDIR.${PKGBASE} overrides the value of ${PKG_SYSCONFDIR} for a
	particular package.

Users will typically want to set PKG_SYSCONFBASE to /etc, or accept the
default location of ${PREFIX}/etc.

This obsoletes the use of CONFDIR, which was active for only 6 days, so no
need to have a workaround to still accept old CONFDIR settings.

2 files changed, 26 insertions, 9 deletions

diff --git a/mk/bsd.pkg.install.mk b/mk/bsd.pkg.install.mk
index 2b3cbd27a8b..a8a3e877439 100644
--- a/mk/bsd.pkg.install.mk
+++ b/mk/bsd.pkg.install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.install.mk,v 1.5 2001/11/23 14:37:24 abs Exp $
+# $NetBSD: bsd.pkg.install.mk,v 1.6 2001/11/25 18:59:50 jlam Exp $
 #
 # This Makefile fragment is included by package Makefiles to use the common
 # INSTALL/DEINSTALL scripts.  To use this Makefile fragment, simply:
@@ -50,7 +50,7 @@ INSTALL_SRC?=		${INSTALL_TEMPLATES}
 FILES_SUBST+=		PREFIX=${PREFIX}
 FILES_SUBST+=		LOCALBASE=${LOCALBASE}
 FILES_SUBST+=		X11BASE=${X11BASE}
-FILES_SUBST+=		CONFDIR=${CONFDIR}
+FILES_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 
 # PKG_USER and PKG_GROUP are the user and group that need to be created
 #	before this package is installed.
@@ -134,8 +134,8 @@ FILES_SUBST+=		RCD_SCRIPTS_DIR=${RCD_SCRIPTS_DIR}
 #       created and should attempt to be destroyed by the INSTALL/DEINSTALL
 #	scripts.  MAKE_DIRS is used the same way, but the package admin
 #	isn't prompted to remove the directory at post-deinstall time if it
-#	isn't empty.  For convenience, ${CONFDIR} and ${RCD_SCRIPTS_DIR} are
-#	automatically added to MAKE_DIRS.
+#	isn't empty.  For convenience, ${PKG_SYSCONFDIR} and
+#	${RCD_SCRIPTS_DIR} are automatically added to MAKE_DIRS.
 #
 # OWN_DIRS_PERMS contains a list of "directory owner group mode" sublists
 #	representing directories for this package that should be
@@ -145,7 +145,7 @@ FILES_SUBST+=		RCD_SCRIPTS_DIR=${RCD_SCRIPTS_DIR}
 #
 MAKE_DIRS?=		# empty
 MAKE_DIRS_PERMS?=	# empty
-_MAKE_DIRS=		${CONFDIR} ${RCD_SCRIPTS_DIR} ${MAKE_DIRS}
+_MAKE_DIRS=		${PKG_SYSCONFDIR} ${RCD_SCRIPTS_DIR} ${MAKE_DIRS}
 OWN_DIRS?=		# empty
 OWN_DIRS_PERMS?=	# empty
 FILES_SUBST+=		MAKE_DIRS=${_MAKE_DIRS:Q}
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 6018feb36f0..b879606474c 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.859 2001/11/21 18:32:01 agc Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.860 2001/11/25 18:59:50 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -51,10 +51,27 @@ SCRIPTDIR?=		${.CURDIR}/scripts
 FILESDIR?=		${.CURDIR}/files
 PKGDIR?=		${.CURDIR}
 
-.if defined(CONFDIR.${PKGBASE})
-CONFDIR=		${CONFDIR.${PKGBASE}}
+# PKG_SYSCONFDIR is where the configuration files for a package may be found.
+# This value may be customized in various ways:
+#
+# PKG_SYSCONFBASE is the main config directory under which all package
+#	configuration files are to be found.
+#
+# PKG_SYSCONFSUBDIR is the subdirectory of PKG_SYSCONFBASE under which the
+#	configuration files for a particular package may be found.
+#
+# PKG_SYSCONFDIR.${PKGBASE} overrides the value of ${PKG_SYSCONFDIR} for a
+#	particular package.
+#
+# Users will typically want to set PKG_SYSCONFBASE to /etc, or accept the
+# default location of ${PREFIX}/etc.
+#
+.if defined(PKG_SYSCONFDIR.${PKGBASE})
+PKG_SYSCONFDIR=		${PKG_SYSCONFDIR.${PKGBASE}}
 .else
-CONFDIR?=		${PREFIX}/etc
+PKG_SYSCONFSUBDIR?=	# empty
+PKG_SYSCONFBASE?=	${PREFIX}/etc
+PKG_SYSCONFDIR?=	${PKG_SYSCONFBASE}/${PKG_SYSCONFSUBDIR}
 .endif
 
 .if defined(USE_JAVA)