From 3e6da65ef9806844cfb4ab73f3dbbb93e713f8f5 Mon Sep 17 00:00:00 2001 From: ngie Date: Wed, 19 Jul 2017 21:06:05 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.freebsd.org/base/stable/10@321251 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- etc/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/etc/Makefile b/etc/Makefile index 926bc8193..cc3587ad1 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -3,9 +3,6 @@ .include -SUBDIR= \ - newsyslog.conf.d - .if ${MK_SENDMAIL} != "no" SUBDIR+=sendmail .endif @@ -244,6 +241,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 -- 2.42.0