From 9097caecaa69cd2956e7f79b7ff7191b585ed401 Mon Sep 17 00:00:00 2001 From: Garrett Cooper Date: Sat, 27 Apr 2013 14:49:21 -0700 Subject: [PATCH] Don't compile/install mailwrapper per MK_MAILWRAPPER OptionalObsoleteFiles.inc was doing the wrong thing by tying the delete to MK_SENDMAIL == no. Signed-off-by: Garrett Cooper --- tools/build/mk/OptionalObsoleteFiles.inc | 2 -- usr.sbin/Makefile | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 81708b3..1affe34 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -3555,9 +3555,7 @@ OLD_FILES+=usr/share/misc/mail.tildehelp .if ${MK_MAILWRAPPER} == no OLD_FILES+=etc/mail/mailer.conf -.if ${MK_SENDMAIL} == no OLD_FILES+=usr/sbin/mailwrapper -.endif OLD_FILES+=usr/share/man/man8/mailwrapper.8.gz .endif diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 02e590e..358351a 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -36,7 +36,6 @@ SUBDIR= adduser \ iostat \ isfctl \ kldxref \ - mailwrapper \ makefs \ memcontrol \ mergemaster \ @@ -227,6 +226,10 @@ SUBDIR+= nscd SUBDIR+= lpr .endif +.if ${MK_MAILWRAPPER} != "no" +SUBDIR+= mailwrapper +.endif + .if ${MK_MAN_UTILS} != "no" SUBDIR+= manctl .endif -- 1.8.2