Use existing CONFDIR instead of adding a new CONFIGDIR

Reported by:	jbeich

diff --git a/libexec/dma/dmagent/Makefile b/libexec/dma/dmagent/Makefile
index 6ce13c03c4a063faa5f10987e2a67017760bb347..6f7e8b0648edc8569375be08aad114213576aeb5 100644 (file)
--- 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=      ${CONFIGDIR}/dma
+CONFSDIR=      ${CONFDIR}/dma
 YFLAGS+=       -i
 CLEANFILES=    aliases_parse.i
 FILES= mailer.conf

diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 53fd073a44ba86ab5cf81c2635b7c5c6c9003338..2f20da8620bee80d48039b99490f11186b2e9526 100644 (file)
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -213,7 +213,6 @@ NLSGRP?=    ${SHAREGRP}
 NLSMODE?=      ${NOBINMODE}
 
 INCLUDEDIR?=   /usr/include
-CONFIGDIR?=    /etc
 
 #
 # install(1) parameters.

diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile
index 8bd11534a3b4c3dfa191bc93e48242cce37a4973..1dcd3b571a05fd171457bacff4095e35943daa32 100644 (file)
--- 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=      ${CONFIGDIR}/ppp
+CONFSDIR=      ${CONFDIR}/ppp
 CONFSMODE=     600
 
 .if ${MK_ATM} == "no"