Date: Sat, 25 Nov 2000 06:42:59 +0100 (CET) From: "Cyrille.Lefevre" <clefevre@citeweb.net> To: FreeBSD-gnats-submit@freebsd.org Subject: conf/23088: make etc-sendmail.cf broke mergemaster Message-ID: <200011250542.eAP5gxn43331@gits.dyndns.org>
next in thread | raw e-mail | index | archive | help
>Number: 23088
>Category: conf
>Synopsis: make etc-sendmail.cf broke mergemaster
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Nov 24 21:50:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: Cyrille Lefevre
>Release: FreeBSD 4.2-STABLE i386
>Organization:
ACME
>Environment:
FreeBSD gits 4.2-STABLE FreeBSD 4.2-STABLE #0: Tue Nov 21 06:13:59 CET 2000 root@gits:/disk2/4.0-stable/src/sys/compile/CUSTOM i386
>Description:
mergemaster doesn't install the right sendmail.cf while
SENDMAIL_CF is defined in /etc/make.conf.
also, move the comments about SENDMAIL_CF and a commented
variable definition from etc/sendmail/Makefile to
etc/defaults/make.conf.
the old behaviour has been followed, that is, do nothing
in make install.
>How-To-Repeat:
echo SENDMAIL_CF=freefall.cf >> /etc/make.conf
mergemaster
>Fix:
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....
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200011250542.eAP5gxn43331>