From owner-svn-src-user@freebsd.org Sun Dec 6 05:42:28 2015
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 8475EA41C0A
for <svn-src-user@mailman.ysv.freebsd.org>;
Sun, 6 Dec 2015 05:42:28 +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 4CE5415AE;
Sun, 6 Dec 2015 05:42:28 +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 tB65gRTc061051;
Sun, 6 Dec 2015 05:42:27 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB65gRrI061050;
Sun, 6 Dec 2015 05:42:27 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201512060542.tB65gRrI061050@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, 6 Dec 2015 05:42:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r291887 - user/ngie/make_check
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Dec 2015 05:42:28 -0000
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