From 6cabd2d9bb0e38d304c2a9a18073bba64f25cf0c Mon Sep 17 00:00:00 2001 From: Gregory Neil Shapiro Date: Thu, 10 Jul 2003 04:53:32 +0000 Subject: [PATCH] Continue trying to build SENDMAIL_CF if the user uses SENDMAIL_CF instead of SENDMAIL_MC but don't remove on it 'make clean' as the user may not have the original .mc file and removing it could be dangerous (e.g., make SENDMAIL_CF=/etc/mail/sendmail.cf clean). Noticed by: peter MFC after: 3 days --- etc/sendmail/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/etc/sendmail/Makefile b/etc/sendmail/Makefile index 21accdd9f191..259f155452d9 100644 --- a/etc/sendmail/Makefile +++ b/etc/sendmail/Makefile @@ -25,6 +25,7 @@ DEST_CF= ${DESTDIR}/etc/mail/sendmail.cf DEST_SUBMIT_CF= ${DESTDIR}/etc/mail/submit.cf ALL= freebsd.cf +CLEANFILES= freebsd.cf # Local SENDMAIL_MC or SENDMAIL_CF may be set in /etc/make.conf. # Warning! If set, this causes 'make install' to always copy it @@ -33,14 +34,17 @@ ALL= freebsd.cf .if defined(SENDMAIL_MC) INSTALL_CF= ${SENDMAIL_MC:T:R}.cf ALL+= ${INSTALL_CF} +CLEANFILES+= ${SENDMAIL_MC:T:R}.cf ${INSTALL_CF}: ${SENDMAIL_MC} .elif defined(SENDMAIL_CF) +ALL+= ${SENDMAIL_CF} INSTALL_CF= ${SENDMAIL_CF} .endif .if !defined(SENDMAIL_SET_USER_ID) && defined(SENDMAIL_SUBMIT_MC) INSTALL_SUBMIT_CF= ${SENDMAIL_SUBMIT_MC:T:R}.cf ALL+= ${INSTALL_SUBMIT_CF} +CLEANFILES+= ${INSTALL_SUBMIT_CF} ${INSTALL_SUBMIT_CF}: ${SENDMAIL_SUBMIT_MC} .endif @@ -48,13 +52,12 @@ ${INSTALL_SUBMIT_CF}: ${SENDMAIL_SUBMIT_MC} .if defined(SENDMAIL_ADDITIONAL_MC) SENDMAIL_ADDITIONAL_CF= ${SENDMAIL_ADDITIONAL_MC:T:S/.mc$/.cf/} ALL+= ${SENDMAIL_ADDITIONAL_CF} +CLEANFILES+= ${SENDMAIL_ADDITIONAL_CF} .for mc in ${SENDMAIL_ADDITIONAL_MC} ${mc:T:R}.cf: ${mc} .endfor .endif -CLEANFILES= ${ALL} - all: ${ALL} install distribution: ${ALL}