From 4e2edaf244b7cb9fe1179367064febf6179a1140 Mon Sep 17 00:00:00 2001 From: Sheldon Hearn Date: Fri, 31 Mar 2000 09:23:54 +0000 Subject: [PATCH] Add a NO_MAILWRAPPER knob to make.conf and wrap it around mailwrapper(8) for folks who find it annoying to have their development version of sendmail blown away by ``make world''. PR: 17394 --- etc/defaults/make.conf | 1 + share/examples/etc/make.conf | 1 + usr.sbin/Makefile | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf index 0ce68625e5a..843e5eb5603 100644 --- a/etc/defaults/make.conf +++ b/etc/defaults/make.conf @@ -38,6 +38,7 @@ # To avoid building various parts of the base system: #NO_CVS= true # do not build CVS #NO_FORTRAN= true # do not build g77 and related libraries +#NO_MAILWRAPPER=true # do not build the mailwrapper(8) MTA selector #NO_OBJC= true # do not build Objective C support #NO_OPENSSH= true # do not build OpenSSH #NO_OPENSSL= true # do not build OpenSSL (implies NO_OPENSSH) diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index 0ce68625e5a..843e5eb5603 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -38,6 +38,7 @@ # To avoid building various parts of the base system: #NO_CVS= true # do not build CVS #NO_FORTRAN= true # do not build g77 and related libraries +#NO_MAILWRAPPER=true # do not build the mailwrapper(8) MTA selector #NO_OBJC= true # do not build Objective C support #NO_OPENSSH= true # do not build OpenSSH #NO_OPENSSL= true # do not build OpenSSL (implies NO_OPENSSH) diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index f2a1e557025..0ae95fb3e09 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -42,7 +42,6 @@ SUBDIR= IPXrouted \ kernbb \ keyserv \ lpr \ - mailwrapper \ manctl \ memcontrol \ mergemaster \ @@ -129,6 +128,10 @@ SUBDIR+=named \ nsupdate .endif +.if !defined(NO_MAILWRAPPER) +SUBDIR+=mailwrapper +.endif + .if !defined(NO_SENDMAIL) SUBDIR+=mailstats \ makemap \