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 Submitted by: Dan McGregor <dan.mcgregor@usask.ca> MFC after: 2 weeks MFC with: r277541, r318441, r318443 Sponsored by: Dell EMC Isilon
This commit is contained in:
parent
d2335a57f4
commit
56ba774ebc
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=318545
@ -7,10 +7,6 @@ FILESGROUPS= FILES
|
||||
|
||||
# No need as it is empty and just causes rebuilds since this file does so much.
|
||||
UPDATE_DEPENDFILE= no
|
||||
SUBDIR= \
|
||||
cron.d \
|
||||
newsyslog.conf.d \
|
||||
syslog.d
|
||||
|
||||
.if ${MK_SENDMAIL} != "no"
|
||||
SUBDIR+=sendmail
|
||||
@ -254,9 +250,11 @@ distribution:
|
||||
.if ${MK_CASPER} != "no"
|
||||
${_+_}cd ${.CURDIR}/casper; ${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
|
||||
@ -266,6 +264,7 @@ distribution:
|
||||
.endif
|
||||
${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install
|
||||
${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
|
||||
${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install
|
||||
${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
|
||||
${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install
|
||||
cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0444 \
|
||||
|
Loading…
Reference in New Issue
Block a user