diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-10-10 10:48:09 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-10-10 10:48:09 +0000 |
| commit | 2c9976e37efeae3b6ab5d59259465bc3e1be244c (patch) | |
| tree | e86276a709ff567ed3bc64bd440180255c9b1ba1 | |
| parent | d5b0fb47eb0bdf81d19eae576791aa4abf6dd676 (diff) | |
| download | src-2c9976e37efeae3b6ab5d59259465bc3e1be244c.tar.gz src-2c9976e37efeae3b6ab5d59259465bc3e1be244c.zip | |
Install bsd.confs.mk
Rename ETCDIR into CONFIGDIR to avoid conflicts with the ports tree
Notes
Notes:
svn path=/head/; revision=289114
| -rw-r--r-- | libexec/dma/dmagent/Makefile | 2 | ||||
| -rw-r--r-- | share/mk/Makefile | 1 | ||||
| -rw-r--r-- | share/mk/bsd.confs.mk | 2 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 2 | ||||
| -rw-r--r-- | usr.sbin/ppp/Makefile | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/libexec/dma/dmagent/Makefile b/libexec/dma/dmagent/Makefile index 6a45a8d598b2..6ce13c03c4a0 100644 --- a/libexec/dma/dmagent/Makefile +++ b/libexec/dma/dmagent/Makefile @@ -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 diff --git a/share/mk/Makefile b/share/mk/Makefile index eaa8e0f82867..a3560b92ff5c 100644 --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -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 \ diff --git a/share/mk/bsd.confs.mk b/share/mk/bsd.confs.mk index a65410c0346a..4e219e828bcf 100644 --- a/share/mk/bsd.confs.mk +++ b/share/mk/bsd.confs.mk @@ -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} diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 450db0844862..53fd073a44ba 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -213,7 +213,7 @@ NLSGRP?= ${SHAREGRP} NLSMODE?= ${NOBINMODE} INCLUDEDIR?= /usr/include -ETCDIR?= /etc +CONFIGDIR?= /etc # # install(1) parameters. diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile index 6a3d8f2d1591..8bd11534a3b4 100644 --- a/usr.sbin/ppp/Makefile +++ b/usr.sbin/ppp/Makefile @@ -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" |