From: Gregory Neil Shapiro <gshapiro@dragonflybsd.org>
Date: Tue, 26 Jul 2005 02:40:25 +0000 (+0000)
Subject: Remove installation of the dragonfly{,.submit}.cf files since users may
X-Git-Tag: v2.0.1~6491
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/6fa8cf633f36906cdb2d73e7bf7fe254fc31fb56

Remove installation of the dragonfly{,.submit}.cf files since users may
do a 'make upgrade' before a 'make buildworld' and the .cf files won't
exist.  Strictly speaking, we don't need them in /etc/mail/ for
/etc/mail/Makefile to work properly anyway so this is a safe change.

I prefer this to adding the .cf files as dependencies to the upgrade
target since that target shouldn't do any building (i.e., 'make upgrade'
doesn't do things like 'make obj' first).
---

diff --git a/etc/sendmail/Makefile b/etc/sendmail/Makefile
index 27965f2baa..4e503a7669 100644
--- a/etc/sendmail/Makefile
+++ b/etc/sendmail/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.19 (Berkeley) 1/14/97
 # $FreeBSD: src/etc/sendmail/Makefile,v 1.31 2004/01/22 17:51:02 ru Exp $
-# $DragonFly: src/etc/sendmail/Makefile,v 1.3 2005/07/25 00:24:31 gshapiro Exp $
+# $DragonFly: src/etc/sendmail/Makefile,v 1.4 2005/07/26 02:40:25 gshapiro Exp $
 
 M4=		m4
 CHMOD=		chmod
@@ -79,9 +79,9 @@ distribution:
 
 upgrade:
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    ${.CURDIR}/dragonfly.mc dragonfly.cf ${DESTDIR}/etc/mail
+	    ${.CURDIR}/dragonfly.mc ${DESTDIR}/etc/mail
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    ${.CURDIR}/dragonfly.submit.mc dragonfly.submit.cf ${DESTDIR}/etc/mail
+	    ${.CURDIR}/dragonfly.submit.mc ${DESTDIR}/etc/mail
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${SMDIR}/helpfile ${DESTDIR}/etc/mail