d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always expose LOCALBASE, not just when CROSS_TOOLCHAIN is defined

Browse Source 
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
This commit is contained in:
Enji Cooper 2015-12-20 05:52:03 +00:00
parent cc696e80e7
commit 4a2a740e17
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.inc1
View File

@ -48,10 +48,11 @@
.error "Both TARGET and TARGET_ARCH must be defined." .error "Both TARGET and TARGET_ARCH must be defined."
.endif .endif
LOCALBASE?= /usr/local
# Cross toolchain changes must be in effect before bsd.compiler.mk # Cross toolchain changes must be in effect before bsd.compiler.mk
# so that gets the right CC, and pass CROSS_TOOLCHAIN to submakes. # so that gets the right CC, and pass CROSS_TOOLCHAIN to submakes.
.if defined(CROSS_TOOLCHAIN) .if defined(CROSS_TOOLCHAIN)
LOCALBASE?= /usr/local
.include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk" .include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk"
CROSSENV+=CROSS_TOOLCHAIN="${CROSS_TOOLCHAIN}" CROSSENV+=CROSS_TOOLCHAIN="${CROSS_TOOLCHAIN}"
.endif .endif
@ -1314,7 +1315,7 @@ packagekernel:
# Build the API documentation with doxygen # Build the API documentation with doxygen
# #
doxygen: .PHONY 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; \ echo "You need doxygen (devel/doxygen) to generate the API documentation of the kernel." | /usr/bin/fmt; \
exit 1; \ exit 1; \
fi fi