From owner-svn-src-head@freebsd.org  Sun Dec 20 05:52:04 2015
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 8C075A143CD;
 Sun, 20 Dec 2015 05:52:04 +0000 (UTC)
 (envelope-from ngie@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 56DE61A69;
 Sun, 20 Dec 2015 05:52:04 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBK5q3Kc007139;
 Sun, 20 Dec 2015 05:52:03 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBK5q3l5007138;
 Sun, 20 Dec 2015 05:52:03 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201512200552.tBK5q3l5007138@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sun, 20 Dec 2015 05:52:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r292502 - 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.20
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: Sun, 20 Dec 2015 05:52:04 -0000

Author: ngie
Date: Sun Dec 20 05:52:03 2015
New Revision: 292502
URL: https://svnweb.freebsd.org/changeset/base/292502

Log:
  Always expose LOCALBASE, not just when CROSS_TOOLCHAIN is defined
  
  Instead of using which(1) to look for doxygen, look for it in <LOCALBASE>/bin .
  $PATH gets mangled by make buildenv, etc so it's better to just be explicit
  about the path if someone uses that for instance.
  
  Differential Revision: https://reviews.freebsd.org/D4406 (part of a larger diff)
  Reviewed by: emaste, Evan Cramer <eccramer@gmail.com>
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Sun Dec 20 05:41:12 2015	(r292501)
+++ head/Makefile.inc1	Sun Dec 20 05:52:03 2015	(r292502)
@@ -48,10 +48,11 @@
 .error "Both TARGET and TARGET_ARCH must be defined."
 .endif
 
+LOCALBASE?=	/usr/local
+
 # Cross toolchain changes must be in effect before bsd.compiler.mk
 # so that gets the right CC, and pass CROSS_TOOLCHAIN to submakes.
 .if defined(CROSS_TOOLCHAIN)
-LOCALBASE?=	/usr/local
 .include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk"
 CROSSENV+=CROSS_TOOLCHAIN="${CROSS_TOOLCHAIN}"
 .endif
@@ -1314,7 +1315,7 @@ packagekernel:
 # Build the API documentation with doxygen
 #
 doxygen: .PHONY
-	@if [ ! -x `/usr/bin/which doxygen` ]; then \
+	@if [ ! -x ${LOCALBASE}/bin/doxygen ]; then \
 		echo "You need doxygen (devel/doxygen) to generate the API documentation of the kernel." | /usr/bin/fmt; \
 		exit 1; \
 	fi