svn commit: r321252 - stable/11/etc

[Ngie Cooper]

Author: ngie
Date: Wed Jul 19 21:06:31 2017
New Revision: 321252
URL: https://svnweb.freebsd.org/changeset/base/321252

Log:
  MFC note:	only the newsyslog.conf.d change has been backported to unbreak
  		"make distribution" with etc/newsyslog.conf.d/opensm.conf
  		installation. The cron.d and syslog.d changes were omitted by
  		request to avoid churn on ^/stable/{10,11}.
  Requested by:	jhb, peter
  
  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/11/etc/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/etc/Makefile
==============================================================================
--- stable/11/etc/Makefile	Wed Jul 19 21:06:05 2017	(r321251)
+++ stable/11/etc/Makefile	Wed Jul 19 21:06:31 2017	(r321252)
@@ -7,8 +7,6 @@ FILESGROUPS=	FILES
 
 # No need as it is empty and just causes rebuilds since this file does so much.
 UPDATE_DEPENDFILE=	no
-SUBDIR=	\
-	newsyslog.conf.d
 
 .if ${MK_SENDMAIL} != "no"
 SUBDIR+=sendmail
@@ -255,6 +253,7 @@ distribution:
 	${_+_}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