diff options
| author | ngie <ngie@FreeBSD.org> | 2017-07-19 21:06:05 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-07-19 21:06:05 +0000 |
| commit | 89fdf92de1b688fc251e10de8bb2e6ae3217062b (patch) | |
| tree | 55633a96e155731eefb7195d8e1ef903f946aabc /etc | |
| parent | 45a74507f34f0d43e88b571ff972e5e75e8b0885 (diff) | |
| download | FreeBSD-src-89fdf92de1b688fc251e10de8bb2e6ae3217062b.zip FreeBSD-src-89fdf92de1b688fc251e10de8bb2e6ae3217062b.tar.gz | |
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
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/etc/Makefile b/etc/Makefile index 926bc81..cc3587a 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -3,9 +3,6 @@ .include <bsd.own.mk> -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 |
