From owner-cvs-all Tue Feb 27 23:25:21 2001 Delivered-To: cvs-all@freebsd.org Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by hub.freebsd.org (Postfix) with ESMTP id 1FE6C37B71A; Tue, 27 Feb 2001 23:25:09 -0800 (PST) (envelope-from ru@whale.sunbay.crimea.ua) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.11.0/8.11.0) id f1S7P6w65140; Wed, 28 Feb 2001 09:25:06 +0200 (EET) (envelope-from ru) Date: Wed, 28 Feb 2001 09:25:06 +0200 From: Ruslan Ermilov To: Gregory Neil Shapiro Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/etc/defaults make.conf src/etc/sendmail Makefil e Message-ID: <20010228092506.B62912@sunbay.com> Mail-Followup-To: Gregory Neil Shapiro , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org References: <200102272132.f1RLW1144998@freefall.freebsd.org> <200102272153.f1RLrav54445@misha.privatelabs.com> <15004.9409.909372.323249@horsey.gshapiro.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <15004.9409.909372.323249@horsey.gshapiro.net>; from gshapiro@FreeBSD.org on Tue, Feb 27, 2001 at 02:05:53PM -0800 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Tue, Feb 27, 2001 at 02:05:53PM -0800, Gregory Neil Shapiro wrote: > mi> And then SENDMAIL_ADDITIONAL_ADDITIONAL_MC? May be, treat the first > mi> (and only) SENDMAIL_MC as a list is better? Yours, > > SENDMAIL_MC determines which config to use for installing > /etc/mail/sendmail.cf. If it is a list, which ones becomes > /etc/mail/sendmail.cf? > The first one :-) How about this patch? Index: Makefile =================================================================== RCS file: /home/ncvs/src/etc/Makefile,v retrieving revision 1.242 diff -u -p -r1.242 Makefile --- Makefile 2001/02/22 03:55:00 1.242 +++ Makefile 2001/02/28 07:23:51 @@ -1,7 +1,9 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 # $FreeBSD: src/etc/Makefile,v 1.242 2001/02/22 03:55:00 gshapiro Exp $ +.if !defined(NO_SENDMAIL) SUBDIR= sendmail +.endif BIN1= amd.map apmd.conf auth.conf \ crontab csh.cshrc csh.login csh.logout \ @@ -73,11 +75,13 @@ distribution: ( cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall ); \ ( cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap ); \ ( cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt ); \ - ( cd ${.CURDIR}/sendmail; ${MAKE} distribution ); \ ( cd ${.CURDIR}/isdn; ${MAKE} install ); \ pwd_mkdb -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd; \ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \ MAKEDEV.local MAKEDEV ${DESTDIR}/dev ) +.if !defined(NO_SENDMAIL) + ( cd ${.CURDIR}/sendmail; ${MAKE} distribution ) +.endif .if !defined(NOUUCP) ( cd ${.CURDIR}/../gnu/libexec/uucp/sample; ${MAKE} install ) .endif And yet one thing. ``helpfile'' should be installed as part of etc/sendmail/Makefile's distribution target. Cheers, -- Ruslan Ermilov Oracle Developer/DBA, ru@sunbay.com Sunbay Software AG, ru@FreeBSD.org FreeBSD committer, +380.652.512.251 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message