From f98f68bd504c0e53fd75bd3b5a102ddf4afe9393 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Sun, 11 Oct 2015 19:25:39 +0000 Subject: [PATCH] Use existing CONFDIR instead of adding a new CONFIGDIR Reported by: jbeich --- libexec/dma/dmagent/Makefile | 2 +- share/mk/bsd.own.mk | 1 - usr.sbin/ppp/Makefile | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libexec/dma/dmagent/Makefile b/libexec/dma/dmagent/Makefile index 6ce13c03c4a0..6f7e8b0648ed 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= ${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 53fd073a44ba..2f20da8620be 100644 --- 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 8bd11534a3b4..1dcd3b571a05 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= ${CONFIGDIR}/ppp +CONFSDIR= ${CONFDIR}/ppp CONFSMODE= 600 .if ${MK_ATM} == "no"