svn commit: r320228 - stable/10/etc

[Ngie Cooper]

Author: ngie
Date: Thu Jun 22 07:42:36 2017
New Revision: 320228
URL: https://svnweb.freebsd.org/changeset/base/320228

Log:
  MFC r318545:
  
  Install {cron.d,newsyslog.conf.d,syslog.d} via `make distribution`, not `make install`
  
  I incorrectly started this pattern in r277541 with the opensm newsyslog.conf.d file,
  and continued using it in r318441 and r318443.
  
  This will fix the files being handled improperly via installworld, preventing tools like
  etcupdate, mergemaster, etc from functioning properly when comparing the installed
  contents on a system vs the contents in a source tree when doing merges.
  
  PR:		219404
  MFC with:	r277541, r318441, r318443

Modified:
  stable/10/etc/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/Makefile
==============================================================================
--- stable/10/etc/Makefile	Thu Jun 22 07:37:10 2017	(r320227)
+++ stable/10/etc/Makefile	Thu Jun 22 07:42:36 2017	(r320228)
@@ -3,11 +3,6 @@
 
 .include <bsd.own.mk>
 
-SUBDIR=	\
-	cron.d \
-	newsyslog.conf.d \
-	syslog.d
-
 .if ${MK_SENDMAIL} != "no"
 SUBDIR+=sendmail
 .endif
@@ -243,9 +238,11 @@ distribution:
 .if ${MK_BLUETOOTH} != "no"
 	${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
 .endif
+	${_+_}cd ${.CURDIR}/cron.d; ${MAKE} install
 	${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
 	${_+_}cd ${.CURDIR}/devd; ${MAKE} install
 	${_+_}cd ${.CURDIR}/gss; ${MAKE} install
+	${_+_}cd ${.CURDIR}/newsyslog.conf.d; ${MAKE} install
 .if ${MK_NTP} != "no"
 	${_+_}cd ${.CURDIR}/ntp; ${MAKE} install
 .endif
@@ -255,6 +252,7 @@ distribution:
 .endif
 	${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install
 	${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap
+	${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install
 	${_+_}cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt
 	${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install
 	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0444 \