svn commit: r292502 - head

[Garrett Cooper]

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 at 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