From owner-svn-src-head@freebsd.org  Sun Oct 11 19:25:41 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1249CA11817;
 Sun, 11 Oct 2015 19:25:41 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B63FF80D;
 Sun, 11 Oct 2015 19:25:40 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9BJPdUx060404;
 Sun, 11 Oct 2015 19:25:39 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9BJPd9d060401;
 Sun, 11 Oct 2015 19:25:39 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201510111925.t9BJPd9d060401@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 11 Oct 2015 19:25:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r289148 - in head: libexec/dma/dmagent share/mk
 usr.sbin/ppp
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Oct 2015 19:25:41 -0000

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"