diff options
| author | phk <phk@FreeBSD.org> | 1998-04-15 16:37:42 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1998-04-15 16:37:42 +0000 |
| commit | 2e0f496de306a87ac3dafbea544cbf99303dc095 (patch) | |
| tree | 1b3d32cac545e4625d50d5892a58cd28796f8574 | |
| parent | 3904536736761b344e3551baffa6f3fe0fc4c9ba (diff) | |
| download | FreeBSD-src-2e0f496de306a87ac3dafbea544cbf99303dc095.zip FreeBSD-src-2e0f496de306a87ac3dafbea544cbf99303dc095.tar.gz | |
In light of the fact that several widespread sendmail alternatives exists
is reason enough to make the compilation & installation of sendmail an
make.conf option. I know that you hate negative options Bruce.
PR: 6284
Reviewed by: phk
Submitted by: Adrian Colley <aecolley@world.std.com>
| -rw-r--r-- | etc/defaults/make.conf | 5 | ||||
| -rw-r--r-- | etc/make.conf | 5 | ||||
| -rw-r--r-- | share/examples/etc/make.conf | 5 | ||||
| -rw-r--r-- | usr.sbin/Makefile | 8 |
4 files changed, 18 insertions, 5 deletions
diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf index 7036943..ba5bf75 100644 --- a/etc/defaults/make.conf +++ b/etc/defaults/make.conf @@ -1,4 +1,4 @@ -# $Id: make.conf,v 1.58 1998/03/18 08:00:25 jkh Exp $ +# $Id: make.conf,v 1.59 1998/03/26 06:06:22 dima Exp $ # # This file, if present, will be read by make (see /usr/share/mk/sys.mk). # It allows you to override macro definitions to make without changing @@ -23,6 +23,9 @@ # To avoid building the suid perl #NOSUIDPERL= true # +# To avoid building sendmail +#NOSENDMAIL= true +# # To have 'obj' symlinks created in your source directory # (they aren't needed/necessary) #OBJLINK= yes diff --git a/etc/make.conf b/etc/make.conf index 7036943..ba5bf75 100644 --- a/etc/make.conf +++ b/etc/make.conf @@ -1,4 +1,4 @@ -# $Id: make.conf,v 1.58 1998/03/18 08:00:25 jkh Exp $ +# $Id: make.conf,v 1.59 1998/03/26 06:06:22 dima Exp $ # # This file, if present, will be read by make (see /usr/share/mk/sys.mk). # It allows you to override macro definitions to make without changing @@ -23,6 +23,9 @@ # To avoid building the suid perl #NOSUIDPERL= true # +# To avoid building sendmail +#NOSENDMAIL= true +# # To have 'obj' symlinks created in your source directory # (they aren't needed/necessary) #OBJLINK= yes diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index 7036943..ba5bf75 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -1,4 +1,4 @@ -# $Id: make.conf,v 1.58 1998/03/18 08:00:25 jkh Exp $ +# $Id: make.conf,v 1.59 1998/03/26 06:06:22 dima Exp $ # # This file, if present, will be read by make (see /usr/share/mk/sys.mk). # It allows you to override macro definitions to make without changing @@ -23,6 +23,9 @@ # To avoid building the suid perl #NOSUIDPERL= true # +# To avoid building sendmail +#NOSENDMAIL= true +# # To have 'obj' symlinks created in your source directory # (they aren't needed/necessary) #OBJLINK= yes diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index fb259ff..d01065f 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $Id: Makefile,v 1.117 1998/03/21 13:52:49 peter Exp $ +# $Id: Makefile,v 1.118 1998/03/23 22:21:34 jb Exp $ # XXX MISSING: mkproto SUBDIR= ac accton adduser amd arp bootparamd cdcontrol chown chroot ckdist \ @@ -9,13 +9,17 @@ SUBDIR= ac accton adduser amd arp bootparamd cdcontrol chown chroot ckdist \ pccard pciconf periodic pkg_install portmap \ ppp pppctl pppd pppstats procctl pw pwd_mkdb quot quotaon rarpd \ repquota rmt rpc.lockd rpc.statd rpc.yppasswdd rpc.ypxfrd \ - rpc.ypupdated rwhod sa sendmail sliplogin slstat \ + rpc.ypupdated rwhod sa sliplogin slstat \ spray sysctl syslogd tcpdump timed traceroute trpt tzsetup vipw \ vnconfig watch wormcontrol xntpd xten ypbind yp_mkdb \ yppoll yppush ypset ypserv zic SUBDIR+=ipfstat ipftest ipmon ipnat ipresend ipsend iptest +.if !defined(NO_SENDMAIL) +SUBDIR+=sendmail +.endif + .if ${MACHINE_ARCH} == "i386" SUBDIR+=crunch kgmon kvm_mkdb natd pcvt pnpinfo pstat rndcontrol \ wlconfig IPXrouted |
