summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-11-25 18:59:45 +0000
committerjlam <jlam@pkgsrc.org>2001-11-25 18:59:45 +0000
commitffceca11a9acb11623d00829c993ca1022b4d164 (patch)
tree78f3dfe5e355bfe3bf2e730202f3d29cb7da98d5 /net
parentcfd5b704a70497d2c14d5e85256db8adea34f050 (diff)
downloadpkgsrc-ffceca11a9acb11623d00829c993ca1022b4d164.tar.gz
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.
Diffstat (limited to 'net')
-rw-r--r--net/samba/Makefile6
-rw-r--r--net/samba20/Makefile6
2 files changed, 8 insertions, 4 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile
index c0462c8ca1a..2e83a8047d8 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2001/11/21 17:16:05 jlam Exp $
+# $NetBSD: Makefile,v 1.70 2001/11/25 18:59:46 jlam Exp $
DISTNAME= samba-2.2.2
WRKSRC= ${WRKDIR}/${DISTNAME}/source
@@ -23,9 +23,11 @@ USE_GNU_READLINE= # uses rl_event_hook interface to GNU readline
.include "../../mk/bsd.prefs.mk"
+PKG_SYSCONFSUBDIR?= samba
+
SAMBA_LOGDIR?= /var/log
SAMBA_LOCKDIR?= /var/run/samba
-SAMBA_ETCDIR?= ${CONFDIR}/samba
+SAMBA_ETCDIR?= ${PKG_SYSCONFDIR}
SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private
SAMBA_DATADIR= ${PREFIX}/share
diff --git a/net/samba20/Makefile b/net/samba20/Makefile
index c87034d041e..c7fcb73bce3 100644
--- a/net/samba20/Makefile
+++ b/net/samba20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/21 17:17:44 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/25 18:59:47 jlam Exp $
DISTNAME= samba-2.0.10
WRKSRC= ${WRKDIR}/${DISTNAME}/source
@@ -17,9 +17,11 @@ USE_BUILDLINK_ONLY= # defined
.include "../../mk/bsd.prefs.mk"
+PKG_SYSCONFSUBDIR?= samba
+
SAMBA_LOGDIR?= /var/log
SAMBA_LOCKDIR?= /var/run/samba
-SAMBA_ETCDIR?= ${CONFDIR}/samba
+SAMBA_ETCDIR?= ${PKG_SYSCONFDIR}
SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private
SAMBA_DATADIR= ${PREFIX}/share