Attachment 11803 Details for Bug 23088 – file.diff

[patch] file.diff

file.diff (text/plain), 1.81 KB, created by clefevre on 2000-11-25 05:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: clefevre

Created: 2000-11-25 05:50:01 UTC

Size: 1.81 KB

patch

obsolete

>Index: defaults/make.conf
>===================================================================
>RCS file: /home/ncvs/src/etc/defaults/make.conf,v
>retrieving revision 1.97.2.26
>diff -u -r1.97.2.26 make.conf
>--- defaults/make.conf	2000/11/10 10:48:10	1.97.2.26
>+++ defaults/make.conf	2000/11/25 05:23:46
>@@ -301,3 +301,8 @@
> #SENDMAIL_LDFLAGS=
> #SENDMAIL_LDADD=
> #SENDMAIL_DPADD=
>+#
>+# Local sendmail.cf.  Warning! If set, this causes 'make install'
>+# to always copy it over /etc/mail/sendmail.cf!!!
>+# Caveat emptor!  Be sure you want this before you enable it.
>+#SENDMAIL_CF?=	freefall.cf
>Index: sendmail/Makefile
>===================================================================
>RCS file: /home/ncvs/src/etc/sendmail/Makefile,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile
>--- sendmail/Makefile	1999/12/19 19:55:18	1.3
>+++ sendmail/Makefile	2000/11/25 05:27:59
>@@ -15,13 +15,10 @@
> 	    $(M4) -D_CF_DIR_=${CFDIR}/ ${CFDIR}/m4/cf.m4 ${@:R}.mc) > ${.TARGET}
> 	$(CHMOD) $(ROMODE) ${.TARGET}
> 
>-ALL=	freebsd.cf
>-
>-# Local sendmail.cf, may be set in /etc/make.conf.  Warning! If set, this
>-# causes 'make install' to always copy it over /etc/mail/sendmail.cf!!!
>-# Caveat emptor!  Be sure you want this before you enable it.
> .if defined(SENDMAIL_CF)
>-ALL+=	${SENDMAIL_CF}
>+ALL=	${SENDMAIL_CF}
>+.else
>+ALL=	freebsd.cf
> .endif
> 
> CLEANFILES+=$(ALL)
>@@ -30,15 +27,15 @@
> 
> depend:
> 
>-install:
> .if defined(SENDMAIL_CF)
>-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${SENDMAIL_CF} \
>-		${DESTDIR}/etc/mail/sendmail.cf
>+install: etc-sendmail.cf
>+.else
>+install:
> .endif
> 
> # Helper for src/etc/Makefile
>-etc-sendmail.cf: freebsd.cf
>-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \
>+etc-sendmail.cf: $(ALL)
>+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 $(ALL) \
> 		${DESTDIR}/etc/mail/sendmail.cf
> 
> # this is overkill, but....

Actions: View | Diff

Attachments on bug 23088: 11803