Attachment 182740 Details for Bug 219404 – Install distribution files with make distribution

[patch] Install distribution files with make distribution

0001-Fix-distribution-of-syslog.d-cron.d-and-newsyslog.co.patch (text/plain), 1.59 KB, created by Dan McGregor on 2017-05-19 14:57:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan McGregor

Created: 2017-05-19 14:57:59 UTC

Size: 1.59 KB

patch

obsolete

>From c156b814f28a810e2261ce65c23c9f3c5324db0f Mon Sep 17 00:00:00 2001
>From: Dan McGregor <dan.mcgregor@usask.ca>
>Date: Wed, 17 May 2017 13:34:58 -0600
>Subject: [PATCH] Fix distribution of syslog.d, cron.d, and newsyslog.conf.d
>
>These were only being installed as part of installworld, not
>distribution. This breaks mergemaster and etcupdate, as well as
>undoing customizations to these files when running installworld.
>---
> etc/Makefile | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
>diff --git a/etc/Makefile b/etc/Makefile
>index fd8ac1cdc094..36241b4c6327 100644
>--- a/etc/Makefile
>+++ b/etc/Makefile
>@@ -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
>@@ -255,9 +251,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:
> 	${_+_}cd ${.CURDIR}/pkg; ${MAKE} install
> .endif
> 	${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install
>+	${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install
> 	${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
> 	${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
> 	${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install
>-- 
>2.13.0
>

Actions: View | Diff

Attachments on bug 219404: 182740