diff options
author | peter <peter@FreeBSD.org> | 1999-01-12 12:38:06 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1999-01-12 12:38:06 +0000 |
commit | 5b758ef6d89ac3abe22adbdc3386c76d72691136 (patch) | |
tree | 6c4f3826ab567145a7eba959bc71c7eab01748b1 /contrib/sendmail/cf/ostype | |
parent | 6788eff0e6370de72568309d3a8b1891341b0991 (diff) | |
download | FreeBSD-src-5b758ef6d89ac3abe22adbdc3386c76d72691136.zip FreeBSD-src-5b758ef6d89ac3abe22adbdc3386c76d72691136.tar.gz |
Merge sendmail 8.9.1 -> 8.9.2 changes into mainline. Some of our changes
were submitted back to sendmail.org (stage 1) and were incorporated.
Diffstat (limited to 'contrib/sendmail/cf/ostype')
-rw-r--r-- | contrib/sendmail/cf/ostype/bsd4.4.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/sendmail/cf/ostype/bsd4.4.m4 b/contrib/sendmail/cf/ostype/bsd4.4.m4 index 711610c..f94e653 100644 --- a/contrib/sendmail/cf/ostype/bsd4.4.m4 +++ b/contrib/sendmail/cf/ostype/bsd4.4.m4 @@ -13,9 +13,9 @@ divert(-1) # divert(0) -VERSIONID(`@(#)bsd4.4.m4 8.9 (Berkeley) 5/19/98') -ifdef(`HELP_FILE',, `define(`HELP_FILE', /usr/share/misc/sendmail.hf)')dnl -ifdef(`STATUS_FILE',, `define(`STATUS_FILE', /var/log/sendmail.st)')dnl +VERSIONID(`@(#)bsd4.4.m4 8.10 (Berkeley) 10/6/1998') +ifdef(`HELP_FILE',, `define(`HELP_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/helpfile', `/usr/share/misc/sendmail.hf'))')dnl +ifdef(`STATUS_FILE',, `define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/var/log/sendmail.st'))')dnl ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /usr/libexec/mail.local)')dnl ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `mail $u')')dnl ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -z -a$g $h!rmail ($u)')')dnl |