diff options
| author | ngie <ngie@FreeBSD.org> | 2015-12-20 05:52:03 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-12-20 05:52:03 +0000 |
| commit | 51188989cf74e47abca0ee217b2ec34b1300f325 (patch) | |
| tree | ba48765b264c6db14febf2ef0bbb8ee7b10e25ca | |
| parent | d28311693af497aac4cafece3d10eb743c041c28 (diff) | |
| download | FreeBSD-src-51188989cf74e47abca0ee217b2ec34b1300f325.zip FreeBSD-src-51188989cf74e47abca0ee217b2ec34b1300f325.tar.gz | |
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
| -rw-r--r-- | Makefile.inc1 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 8a43898..5718e17 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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 |
