diff options
author | gshapiro <gshapiro@FreeBSD.org> | 2002-04-14 19:20:26 +0000 |
---|---|---|
committer | gshapiro <gshapiro@FreeBSD.org> | 2002-04-14 19:20:26 +0000 |
commit | b7ddd3c1a92f5a06e9889839c02f07c72af84352 (patch) | |
tree | 7f0caf6aafa657815db43e70fde05e8de921c2a9 /etc/mail | |
parent | de25faf452e88d5a25f663bbd76770858c7ee863 (diff) | |
download | FreeBSD-src-b7ddd3c1a92f5a06e9889839c02f07c72af84352.zip FreeBSD-src-b7ddd3c1a92f5a06e9889839c02f07c72af84352.tar.gz |
Provide a new make.conf knob, SENDMAIL_SUBMIT_MC to allow users to pick
the .mc file used for /etc/mail/submit.cf. By default,
/etc/mail/freebsd.submit.mc is installed and used.
Requested by: fenner
Submitted by: ume
MFC after: 1 week
Diffstat (limited to 'etc/mail')
-rw-r--r-- | etc/mail/Makefile | 44 |
1 files changed, 33 insertions, 11 deletions
diff --git a/etc/mail/Makefile b/etc/mail/Makefile index 238b906..e5ab41c 100644 --- a/etc/mail/Makefile +++ b/etc/mail/Makefile @@ -41,14 +41,19 @@ # running sendmail to pick up the changes as well. # # ------------------------------------------------------------------------ -# -# This makefile uses `<HOSTNAME>.mc' as the default .mc file. This can -# be changed by defining SENDMAIL_MC in /etc/make.conf, e.g.: +# This Makefile uses `<HOSTNAME>.mc' as the default MTA .mc file. This +# can be changed by defining SENDMAIL_MC in /etc/make.conf, e.g.: # # SENDMAIL_MC=/etc/mail/myconfig.mc # # If '<HOSTNAME>.mc' does not exist, it is created using 'freebsd.mc' # as a template. +# +# It also uses 'freebsd.submit.mc' as the default mail submission .mc file. +# This can be changed by defining SENDMAIL_SUBMIT_MC in /etc/make.conf, +# e.g.: +# +# SENDMAIL_SUBMIT_MC=/etc/mail/mysubmit.mc # ------------------------------------------------------------------------ # # The Makefile knows about the following maps: @@ -64,8 +69,14 @@ ${SENDMAIL_MC}: cp freebsd.mc ${SENDMAIL_MC} .endif +SENDMAIL_SUBMIT_MC?= freebsd.submit.mc + INSTALL_CF= ${SENDMAIL_MC:R}.cf +.ifndef SENDMAIL_SET_USER_ID +INSTALL_SUBMIT_CF= ${SENDMAIL_SUBMIT_MC:R}.cf +.endif + SENDMAIL_ALIASES?= /etc/mail/aliases # @@ -160,24 +171,35 @@ clean: depend: -cf: ${INSTALL_CF} +cf: ${INSTALL_CF} ${INSTALL_SUBMIT_CF} -submit.cf: submit.mc +.ifdef SENDMAIL_SET_USER_ID +install: install-cf +.else +install: install-cf install-submit-cf +.endif + +install-cf: ${INSTALL_CF} +.if ${INSTALL_CF} != /etc/mail/sendmail.cf + ${INSTALL} -c -m ${SHAREMODE} ${INSTALL_CF} /etc/mail/sendmail.cf +.endif + + +install-submit-cf: ${INSTALL_SUBMIT_CF} .ifdef SENDMAIL_SET_USER_ID @echo ">>> ERROR: You should not create a submit.cf file if you are using a" @echo " set-user-ID sendmail binary (SENDMAIL_SET_USER_ID is set" @echo " in make.conf)." @false +.else +.if ${INSTALL_SUBMIT_CF} != /etc/mail/submit.cf + ${INSTALL} -c -m ${SHAREMODE} ${INSTALL_SUBMIT_CF} /etc/mail/submit.cf +.endif .endif - -maps: ${SENDMAIL_MAP_OBJ} aliases: ${SENDMAIL_ALIASES}.db -install: ${INSTALL_CF} -.if ${INSTALL_CF} != /etc/mail/sendmail.cf - ${INSTALL} -c -m ${SHAREMODE} ${INSTALL_CF} /etc/mail/sendmail.cf -.endif +maps: ${SENDMAIL_MAP_OBJ} start start-mta start-mspq: @if [ -r ${SENDMAIL_START_SCRIPT} ]; then \ |