Author: bapt
Date: Sun Oct 11 19:25:39 2015
New Revision: 289148
URL: https://svnweb.freebsd.org/changeset/base/289148

Log:
  Use existing CONFDIR instead of adding a new CONFIGDIR
  
  Reported by:  jbeich

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

Modified: head/libexec/dma/dmagent/Makefile
==============================================================================
--- head/libexec/dma/dmagent/Makefile   Sun Oct 11 18:37:29 2015        
(r289147)
+++ head/libexec/dma/dmagent/Makefile   Sun Oct 11 19:25:39 2015        
(r289148)
@@ -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

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk    Sun Oct 11 18:37:29 2015        (r289147)
+++ head/share/mk/bsd.own.mk    Sun Oct 11 19:25:39 2015        (r289148)
@@ -213,7 +213,6 @@ NLSGRP?=    ${SHAREGRP}
 NLSMODE?=      ${NOBINMODE}
 
 INCLUDEDIR?=   /usr/include
-CONFIGDIR?=    /etc
 
 #
 # install(1) parameters.

Modified: head/usr.sbin/ppp/Makefile
==============================================================================
--- head/usr.sbin/ppp/Makefile  Sun Oct 11 18:37:29 2015        (r289147)
+++ head/usr.sbin/ppp/Makefile  Sun Oct 11 19:25:39 2015        (r289148)
@@ -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"
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to