From 5734ac28b47bec881d8d8232ca429c59d2024776 Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Wed, 27 May 1998 09:25:22 +0000 Subject: [PATCH] "make world" replaces /bin/rmail even when NO_SENDMAIL has been set to true in /etc/make.conf. Both qmail and smail use a different rmail, so replacing rmail is a Bad Thing. PR: 6762 Reviewed by: phk Submitted by: Bill Trost --- bin/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/Makefile b/bin/Makefile index 5833e7f9d561..15fe34f7b501 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -1,10 +1,14 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id: Makefile,v 1.10 1998/03/13 19:39:14 jb Exp $ +# $Id: Makefile,v 1.11 1998/05/09 06:42:52 jb Exp $ SUBDIR= cat chio chmod cp csh date dd domainname echo ed expr hostname \ - kill ln ls mkdir mv pax pwd rcp rm rmail rmdir sh sleep \ + kill ln ls mkdir mv pax pwd rcp rm rmdir sh sleep \ stty sync test +.if !defined(NO_SENDMAIL) +SUBDIR+=rmail +.endif + .if ${MACHINE_ARCH} == "i386" SUBDIR+=df ps .endif