From c196847223dd1b40641019317bb50e2468458b0a Mon Sep 17 00:00:00 2001
From: agc <agc>
Date: Fri, 14 Jul 2000 12:39:30 +0000
Subject: Introduce the mk.conf definition for PRIV_CONF_DIR, which defaults to
 ${LOCALBASE}/etc, and is the parent directory of the priv package's user
 configuration data.

Modify Makefile to pick up this definition, and pass it on as an argument
to the configure script.

Modify the PLIST to include this location, and pre-process the PLIST at
install time to set the correct location.
---
 security/priv/Makefile  | 13 ++++++++++++-
 security/priv/pkg/PLIST |  6 +++---
 2 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'security/priv')

diff --git a/security/priv/Makefile b/security/priv/Makefile
index 2aa579936d3..495df895ee1 100644
--- a/security/priv/Makefile
+++ b/security/priv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/07/14 11:48:19 agc Exp $
+# $NetBSD: Makefile,v 1.3 2000/07/14 12:39:30 agc Exp $
 #
 
 DISTNAME=	priv-1.0-beta
@@ -10,4 +10,15 @@ MAINTAINER=	simonb@netbsd.org
 
 GNU_CONFIGURE=	yes
 
+PLIST_SRC=	${WRKDIR}/plist
+
+.include "../../mk/bsd.prefs.mk"
+
+PRIV_CONF_DIR?=	${LOCALBASE}/etc
+
+CONFIGURE_ARGS+=	--sysconfdir=${PRIV_CONF_DIR}
+
+post-install:
+	${SED} -e 's|@PRIV_CONF_DIR@|${PRIV_CONF_DIR}|g' ${PKGDIR}/PLIST > ${PLIST_SRC}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/priv/pkg/PLIST b/security/priv/pkg/PLIST
index 4a050a2486b..7a2a19b12e9 100644
--- a/security/priv/pkg/PLIST
+++ b/security/priv/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2000/07/14 11:46:28 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/07/14 12:39:31 agc Exp $
 bin/priv
 man/man1/priv.1
-@exec mkdir -p %D/etc/priv || true
-@dirrm etc/priv
+@exec mkdir -p @PRIV_CONF_DIR@/priv || true
+@unexec rmdir @PRIV_CONF_DIR@/priv || true
-- 
cgit v1.2.3