summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgshapiro <gshapiro@FreeBSD.org>2001-02-22 03:55:08 +0000
committergshapiro <gshapiro@FreeBSD.org>2001-02-22 03:55:08 +0000
commit6af82228b4ff0156897b6c7036e21107615a8cef (patch)
tree479505f07659c6214b75aa018a554abebeb0330e
parentebbc740417bdae075be8b7b89fa9143470af0e65 (diff)
downloadFreeBSD-src-6af82228b4ff0156897b6c7036e21107615a8cef.zip
FreeBSD-src-6af82228b4ff0156897b6c7036e21107615a8cef.tar.gz
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.
-rw-r--r--etc/Makefile2
-rw-r--r--etc/sendmail/Makefile4
-rw-r--r--usr.sbin/sendmail/Makefile2
3 files changed, 4 insertions, 4 deletions
diff --git a/etc/Makefile b/etc/Makefile
index df9a48e..d0e3892 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 c0b565a..76e0679 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 d529668..a830b83 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
OpenPOWER on IntegriCloud