svn commit: r301163 - in head: etc libexec/dma/dmagent

Glen Barber gjb at FreeBSD.org
Wed Jun 1 20:06:56 UTC 2016


Author: gjb
Date: Wed Jun  1 20:06:55 2016
New Revision: 301163
URL: https://svnweb.freebsd.org/changeset/base/301163

Log:
  Implement a hack to re-enable installation of the dma.conf.
  
  The 'CONFS' entries in share/mk/bsd.confs.mk explicitly check
  for the 'installconfig', but does not behave properly with the
  'distribute' target.
  
  This seems to be related to the previously-reported issues
  with files within /etc in the past.
  
  Reported by:	Ben Woods
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/etc/Makefile
  head/libexec/dma/dmagent/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Wed Jun  1 20:04:24 2016	(r301162)
+++ head/etc/Makefile	Wed Jun  1 20:06:55 2016	(r301163)
@@ -309,6 +309,10 @@ distribution:
 	cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
 	    ${PPPCNF} ${DESTDIR}/etc/ppp
 .endif
+.if ${MK_DMAGENT} != "no"
+	cd ${.CURDIR}/../libexec/dma/dmagent; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+	    dma.conf ${DESTDIR}/etc/dma
+.endif
 .if ${MK_MAIL} != "no"
 	cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${ETCMAIL} ${DESTDIR}/etc/mail

Modified: head/libexec/dma/dmagent/Makefile
==============================================================================
--- head/libexec/dma/dmagent/Makefile	Wed Jun  1 20:04:24 2016	(r301162)
+++ head/libexec/dma/dmagent/Makefile	Wed Jun  1 20:06:55 2016	(r301163)
@@ -18,8 +18,6 @@ SRCS=	aliases_parse.y \
 	spool.c \
 	util.c
 MAN8=	dma.8
-CONFS=	dma.conf
-CONFSDIR=	${CONFDIR}/dma
 YFLAGS+=	-i
 CLEANFILES=	aliases_parse.i
 FILES=	mailer.conf


More information about the svn-src-all mailing list