From e4e1027a2e276ac8d99f273dae97273f0b9b9f2c Mon Sep 17 00:00:00 2001 From: Gregory Neil Shapiro Date: Thu, 22 Feb 2001 03:55:08 +0000 Subject: [PATCH] Move creation of the sendmail statistics file from the usr.sbin/sendmail Makefile to the etc/sendmail Makefile to be consistent with all of the other /var file creations. In doing so, change the Makefile target from etc-sendmail.cf to distribution as it installs more than just the sendmail.cf. --- etc/Makefile | 2 +- etc/sendmail/Makefile | 4 +++- usr.sbin/sendmail/Makefile | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/Makefile b/etc/Makefile index df9a48e8cda..d0e38928eba 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -73,7 +73,7 @@ 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} etc-sendmail.cf ); \ + ( 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 \ diff --git a/etc/sendmail/Makefile b/etc/sendmail/Makefile index c0b565a88e7..76e0679fcb0 100644 --- a/etc/sendmail/Makefile +++ b/etc/sendmail/Makefile @@ -37,9 +37,11 @@ install: .endif # Helper for src/etc/Makefile -etc-sendmail.cf: freebsd.cf +distribution: freebsd.cf ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \ ${DESTDIR}/etc/mail/sendmail.cf + ${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 diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile index d529668c37e..a830b836975 100644 --- a/usr.sbin/sendmail/Makefile +++ b/usr.sbin/sendmail/Makefile @@ -62,8 +62,6 @@ LDADD+=${SENDMAIL_LDADD} LDFLAGS+=${SENDMAIL_LDFLAGS} beforeinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ - ${DESTDIR}/var/log/sendmail.st ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${SMDIR}/helpfile \ ${DESTDIR}/etc/mail/helpfile