From fab9e3acacc03fd912826a793620b50cfd5684f0 Mon Sep 17 00:00:00 2001
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Wed, 28 Feb 2001 04:04:07 +0000
Subject: [PATCH] Fix dependencies and cleanup spacing in the file

---
 etc/sendmail/Makefile | 46 +++++++++++++++++++------------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/etc/sendmail/Makefile b/etc/sendmail/Makefile
index 63f49fab7e90..43f602dc20e1 100644
--- a/etc/sendmail/Makefile
+++ b/etc/sendmail/Makefile
@@ -1,19 +1,22 @@
 #	@(#)Makefile	8.19 (Berkeley) 1/14/97
 # $FreeBSD$
 
-M4=	m4
-CFDIR=	${.CURDIR}/../../contrib/sendmail/cf
-CHMOD=	chmod
-ROMODE=	444
-RM=	rm -f
+M4=		m4
+CHMOD=		chmod
+ROMODE=		444
+RM=		rm -f
+CFDIR=		${.CURDIR}/../../contrib/sendmail/cf
 
-.SUFFIXES:  .mc .cf
+# this is overkill, but....
+M4FILES!=	find ${CFDIR} -type f -name '*.m4' -print
 
-.mc.cf:
-	$(RM) ${.TARGET}
+.SUFFIXES:	.mc .cf
+
+.mc.cf:		${M4FILES}
+	${RM} ${.TARGET}
 	(cd ${.CURDIR} && \
-	    $(M4) -D_CF_DIR_=${CFDIR}/ ${CFDIR}/m4/cf.m4 ${@:R}.mc) > ${.TARGET}
-	$(CHMOD) $(ROMODE) ${.TARGET}
+	    ${M4} -D_CF_DIR_=${CFDIR}/ ${CFDIR}/m4/cf.m4 ${@:R}.mc) > ${.TARGET}
+	${CHMOD} ${ROMODE} ${.TARGET}
 
 ALL=	freebsd.cf
 
@@ -29,35 +32,31 @@ INSTALL_CF=	${SENDMAIL_CF}
 .endif
 .endif
 
-.if defined(INSTALL_CF)
-ALL+=	${INSTALL_CF}
-.endif
+ALL+=		${INSTALL_CF}
 
 # Additional .cf files to build
 .if defined(SENDMAIL_ADDITIONAL_MC)
-ALL+=	${SENDMAIL_ADDITIONAL_MC:S/.mc$/.cf/g}
+ALL+=		${SENDMAIL_ADDITIONAL_MC:S/.mc$/.cf/g}
 .endif
 
-CLEANFILES+=$(ALL)
+CLEANFILES+=	${ALL}
 
-all: $(ALL)
+all:		${ALL}
 
 depend:
 
-.if defined(INSTALL_CF)
-install: ${INSTALL_CF}
+install:	${INSTALL_CF}
 .if (defined(SENDMAIL_MC) && defined(SENDMAIL_CF))
 	@echo ">>> ERROR: Both SENDMAIL_CF and SENDMAIL_MC can not be set"
 	@false
 .endif
+.if defined(INSTALL_CF)
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${INSTALL_CF} \
 		${DESTDIR}/etc/mail/sendmail.cf
-.else
-install:
 .endif
 
 # Helper for src/etc/Makefile
-distribution: freebsd.cf freebsd.mc
+distribution:	freebsd.cf freebsd.mc ${INSTALL_CF}
 .if (defined(SENDMAIL_MC) && defined(SENDMAIL_CF))
 	@echo ">>> ERROR: Both SENDMAIL_CF and SENDMAIL_MC can not be set"
 	@false
@@ -76,9 +75,4 @@ distribution: freebsd.cf freebsd.mc
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
 	    ${DESTDIR}/var/log/sendmail.st
 
-# this is overkill, but....
-M4FILES!= find ${CFDIR} -type f -name '*.m4' -print
-
-$(ALL):  $(M4FILES)
-
 .include <bsd.prog.mk>