diff options
| author | ngie <ngie@FreeBSD.org> | 2017-06-22 07:42:36 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-06-22 07:42:36 +0000 |
| commit | 3253eff542c258dcfa4669d011c4df219400a829 (patch) | |
| tree | 904668271c27d2734fd4d5a4b23f44f70f081224 | |
| parent | 2878d7c48a21b0897f6481229963bb9aff0f98d8 (diff) | |
| download | FreeBSD-src-3253eff542c258dcfa4669d011c4df219400a829.zip FreeBSD-src-3253eff542c258dcfa4669d011c4df219400a829.tar.gz | |
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
| -rw-r--r-- | etc/Makefile | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/etc/Makefile b/etc/Makefile index edf4a5c..3d1f592 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -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 \ |
