svn commit: r291887 - user/ngie/make_check

[Garrett Cooper]

Author: ngie
Date: Sun Dec  6 05:42:27 2015
New Revision: 291887
URL: https://svnweb.freebsd.org/changeset/base/291887

Log:
  - Make LOCALBASE always available
  - Look for doxygen in ${LOCALBASE}/bin, as the Makefile.inc1 $PATH doesn't
    include /usr/local/bin/

Modified:
  user/ngie/make_check/Makefile.inc1

Modified: user/ngie/make_check/Makefile.inc1
==============================================================================
--- user/ngie/make_check/Makefile.inc1	Sun Dec  6 05:37:54 2015	(r291886)
+++ user/ngie/make_check/Makefile.inc1	Sun Dec  6 05:42:27 2015	(r291887)
@@ -48,10 +48,10 @@
 .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
@@ -1289,7 +1289,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