diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2001-11-11 05:26:59 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2001-11-11 05:26:59 +0000 |
| commit | c392a88ad032a07395a2a8de633c30660dbe48aa (patch) | |
| tree | 1786de06a50acef3a9d26174133002998b4a2a51 /usr.bin | |
| parent | 2e6046c062087fdcec69cbe6f202143e79d28708 (diff) | |
| download | FreeBSD-src-c392a88ad032a07395a2a8de633c30660dbe48aa.zip FreeBSD-src-c392a88ad032a07395a2a8de633c30660dbe48aa.tar.gz | |
Fix NO_SENDMAIL knob. When FreeBSD's old BSD version of vacation was
replaced with the new version in sendmail's distribution, vacation and
the necessary libraries (libsmdb and libsmutil) were changed so they
were always compiled. This broke people who didn't checkout
src/contrib/sendmail/. I don't know if it's best to think of NO_SENDMAIL
as no sendmail sources available or no sendmail binary. It is now the former.
Also, remove the sendmail chapter from System Managers Manual (SMM) if
NO_SENDMAIL is defined (for similar reasons -- source not available).
PR: 31863, 31865
Submitted by: matusita, Joe Kelsey <joe@zircon.seattle.wa.us>
MFC after: 3 days
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 34d9ab1..7ff1f86 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -168,7 +168,6 @@ SUBDIR= apply \ users \ uudecode \ uuencode \ - vacation \ vgrind \ vi \ vis \ @@ -207,6 +206,10 @@ SUBDIR+=dig \ host .endif +.if !defined(NO_SENDMAIL) +SUBDIR+=vacation +.endif + .if ${MACHINE_ARCH} == "i386" # Things that don't compile on alpha or are aout specific: SUBDIR+=ar \ |
