summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2015-10-12 21:02:36 +0000
committerpeter <peter@FreeBSD.org>2015-10-12 21:02:36 +0000
commit5ed5abebc80fc662ac90ebcc473e3f36600fc62d (patch)
tree12a02af793694af01926cb28201e13930c78d764 /etc
parente779ea6de217fb56ace1c5c0ea11a1893369dc4e (diff)
downloadFreeBSD-src-5ed5abebc80fc662ac90ebcc473e3f36600fc62d.zip
FreeBSD-src-5ed5abebc80fc662ac90ebcc473e3f36600fc62d.tar.gz
If world is built with a custom sendmail.cf, use it for the distribution
target. This is the feeder for mergemaster / etcupdate. This change makes installworld/mergemaster/etcupdate behave the same regardless of whether SENDMAIL_MC or SENDMAIL_CF is used. If you use a custom SENDMAIL_MC/CF in make.conf and excluded it from mergemaster.rc/etcupdate.conf to work around the conflicts, you may wish to revert that or change it from 'ignore' to 'always install'. If you do not use a custom SENDMAIL_MC/CF, there should be no change in behavior.
Diffstat (limited to 'etc')
-rw-r--r--etc/sendmail/Makefile21
1 files changed, 11 insertions, 10 deletions
diff --git a/etc/sendmail/Makefile b/etc/sendmail/Makefile
index 719f351..5578704 100644
--- a/etc/sendmail/Makefile
+++ b/etc/sendmail/Makefile
@@ -72,24 +72,25 @@ distribution:
${SMDIR}/helpfile ${DESTDIR}/etc/mail
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 640 \
/dev/null ${DESTDIR}/var/log/sendmail.st
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
- freebsd.cf ${DEST_CF}
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
- freebsd.submit.cf ${DEST_SUBMIT_CF}
-
-install:
-.if defined(INSTALL_CF) && ${INSTALL_CF} != ${DEST_CF}
+.if defined(INSTALL_CF)
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${INSTALL_CF} ${DEST_CF}
+.else
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ freebsd.cf ${DEST_CF}
.endif
.if defined(SENDMAIL_ADDITIONAL_CF)
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${SENDMAIL_ADDITIONAL_CF} ${DESTDIR}/etc/mail
.endif
-.if !defined(SENDMAIL_SET_USER_ID) && \
- defined(INSTALL_SUBMIT_CF) && ${INSTALL_SUBMIT_CF} != ${DEST_SUBMIT_CF}
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+.if !defined(SENDMAIL_SET_USER_ID)
+.if defined(INSTALL_SUBMIT_CF)
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
${INSTALL_SUBMIT_CF} ${DEST_SUBMIT_CF}
+.else
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ freebsd.submit.cf ${DEST_SUBMIT_CF}
+.endif
.endif
.include <bsd.prog.mk>
OpenPOWER on IntegriCloud