diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 1999-12-19 19:55:19 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 1999-12-19 19:55:19 +0000 |
| commit | 8bdd91e3a1588f2f10b68c5aca723cf87c0722a0 (patch) | |
| tree | 11022f445c1f3c7830aa5832afe475c33baa1f19 | |
| parent | e23b011f502d62d6896c89ed51c647d6db533c25 (diff) | |
Notes
| -rw-r--r-- | contrib/sendmail/src/conf.h | 6 | ||||
| -rw-r--r-- | etc/sendmail/Makefile | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/contrib/sendmail/src/conf.h b/contrib/sendmail/src/conf.h index 6097c27694b6..b8df01dbcaaf 100644 --- a/contrib/sendmail/src/conf.h +++ b/contrib/sendmail/src/conf.h @@ -12,6 +12,8 @@ * @(#)conf.h 8.385 (Berkeley) 1/28/1999 */ +/* $FreeBSD$ */ + /* ** CONF.H -- All user-configurable parameters for sendmail ** @@ -831,6 +833,10 @@ typedef int pid_t; #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) # include <paths.h> +# if defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) +# define _PATH_VENDOR_CF "/etc/mail/sendmail.cf" +# define USE_VENDOR_CF_PATH +# endif # define HASUNSETENV 1 /* has unsetenv(3) call */ # define HASSETSID 1 /* has the setsid(2) POSIX syscall */ # define USESETEUID 1 /* has useable seteuid(2) call */ diff --git a/etc/sendmail/Makefile b/etc/sendmail/Makefile index ea1952989ece..c0b565a88e77 100644 --- a/etc/sendmail/Makefile +++ b/etc/sendmail/Makefile @@ -18,7 +18,7 @@ RM= rm -f ALL= freebsd.cf # Local sendmail.cf, may be set in /etc/make.conf. Warning! If set, this -# causes 'make install' to always copy it over /etc/sendmail.cf!!! +# causes 'make install' to always copy it over /etc/mail/sendmail.cf!!! # Caveat emptor! Be sure you want this before you enable it. .if defined(SENDMAIL_CF) ALL+= ${SENDMAIL_CF} @@ -33,13 +33,13 @@ depend: install: .if defined(SENDMAIL_CF) ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${SENDMAIL_CF} \ - ${DESTDIR}/etc/sendmail.cf + ${DESTDIR}/etc/mail/sendmail.cf .endif # Helper for src/etc/Makefile etc-sendmail.cf: freebsd.cf ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \ - ${DESTDIR}/etc/sendmail.cf + ${DESTDIR}/etc/mail/sendmail.cf # this is overkill, but.... M4FILES!= find ${CFDIR} -type f -name '*.m4' -print |