svn commit: r289114 - in head: libexec/dma/dmagent share/mk usr.sbin/ppp

[Baptiste Daroussin]

Author: bapt
Date: Sat Oct 10 10:48:09 2015
New Revision: 289114
URL: https://svnweb.freebsd.org/changeset/base/289114

Log:
  Install bsd.confs.mk
  Rename ETCDIR into CONFIGDIR to avoid conflicts with the ports tree

Modified:
  head/libexec/dma/dmagent/Makefile
  head/share/mk/Makefile
  head/share/mk/bsd.confs.mk
  head/share/mk/bsd.own.mk
  head/usr.sbin/ppp/Makefile

Modified: head/libexec/dma/dmagent/Makefile
==============================================================================
--- head/libexec/dma/dmagent/Makefile	Sat Oct 10 09:37:31 2015	(r289113)
+++ head/libexec/dma/dmagent/Makefile	Sat Oct 10 10:48:09 2015	(r289114)
@@ -17,7 +17,7 @@ SRCS=	aliases_parse.y \
 	util.c
 MAN8=	dma.8
 CONFS=	dma.conf
-CONFSDIR=	${ETCDIR}/dma
+CONFSDIR=	${CONFIGDIR}/dma
 YFLAGS+=	-i
 CLEANFILES=	aliases_parse.i
 FILES=	mailer.conf

Modified: head/share/mk/Makefile
==============================================================================
--- head/share/mk/Makefile	Sat Oct 10 09:37:31 2015	(r289113)
+++ head/share/mk/Makefile	Sat Oct 10 10:48:09 2015	(r289114)
@@ -13,6 +13,7 @@ FILES=	\
 	bsd.README \
 	bsd.arch.inc.mk \
 	bsd.compiler.mk \
+	bsd.confs.mk \
 	bsd.cpu.mk \
 	bsd.crunchgen.mk \
 	bsd.dep.mk \

Modified: head/share/mk/bsd.confs.mk
==============================================================================
--- head/share/mk/bsd.confs.mk	Sat Oct 10 09:37:31 2015	(r289113)
+++ head/share/mk/bsd.confs.mk	Sat Oct 10 10:48:09 2015	(r289114)
@@ -22,7 +22,7 @@ all: buildconfig
 ${group}OWN?=	${SHAREOWN}
 ${group}GRP?=	${SHAREGRP}
 ${group}MODE?=	${CONFMODE}
-${group}DIR?=	${ETCDIR}/
+${group}DIR?=	${CONFIGDIR}/
 STAGE_SETS+=	${group}
 STAGE_DIR.${group}= ${STAGE_OBJTOP}${${group}DIR}
 STAGE_SYMLINKS_DIR.${group}= ${STAGE_OBJTOP}

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Sat Oct 10 09:37:31 2015	(r289113)
+++ head/share/mk/bsd.own.mk	Sat Oct 10 10:48:09 2015	(r289114)
@@ -213,7 +213,7 @@ NLSGRP?=	${SHAREGRP}
 NLSMODE?=	${NOBINMODE}
 
 INCLUDEDIR?=	/usr/include
-ETCDIR?=	/etc
+CONFIGDIR?=	/etc
 
 #
 # install(1) parameters.

Modified: head/usr.sbin/ppp/Makefile
==============================================================================
--- head/usr.sbin/ppp/Makefile	Sat Oct 10 09:37:31 2015	(r289113)
+++ head/usr.sbin/ppp/Makefile	Sat Oct 10 10:48:09 2015	(r289114)
@@ -22,7 +22,7 @@ PPP_NO_RADIUS=
 PPP_NO_SUID=
 .endif
 CONFS=	ppp.conf
-CONFSDIR=	${ETCDIR}/ppp
+CONFSDIR=	${CONFIGDIR}/ppp
 CONFSMODE=	600
 
 .if ${MK_ATM} == "no"