From owner-svn-src-head@freebsd.org  Tue Jul 19 18:05:27 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3381EB9EF17;
 Tue, 19 Jul 2016 18:05:27 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id F3CDC1C86;
 Tue, 19 Jul 2016 18:05:26 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6JI5QQO099588;
 Tue, 19 Jul 2016 18:05:26 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6JI5Q0V099587;
 Tue, 19 Jul 2016 18:05:26 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201607191805.u6JI5Q0V099587@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 19 Jul 2016 18:05:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r303034 - head
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Jul 2016 18:05:27 -0000

Author: emaste
Date: Tue Jul 19 18:05:25 2016
New Revision: 303034
URL: https://svnweb.freebsd.org/changeset/base/303034

Log:
  Include makewhatis in ITOOLS when MK_MAN_UTILS is true
  
  Previously it was conditional on MK_MAN. It's possible to build
  FreeBSD with man pages but without man page tools. MK_MAN_UTILS
  is the conditional used in share/man/Makefile for determining whether
  makewhatis is executed at install time, so it is the proper one for
  ITOOLS as well.
  
  PR:		210142
  MFC after:	1 week

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Jul 19 17:46:09 2016	(r303033)
+++ head/Makefile.inc1	Tue Jul 19 18:05:25 2016	(r303034)
@@ -884,7 +884,7 @@ ITOOLS=	[ awk cap_mkdb cat chflags chmod
 	${LOCAL_ITOOLS}
 
 # Needed for share/man
-.if ${MK_MAN} != "no"
+.if ${MK_MAN_UTILS} != "no"
 ITOOLS+=makewhatis
 .endif