From owner-svn-src-projects@FreeBSD.ORG  Wed Nov 19 07:09:44 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8FDB7ED0;
 Wed, 19 Nov 2014 07:09:44 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 7D227873;
 Wed, 19 Nov 2014 07:09:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJ79iBh048245;
 Wed, 19 Nov 2014 07:09:44 GMT (envelope-from sjg@FreeBSD.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAJ79iRi048244;
 Wed, 19 Nov 2014 07:09:44 GMT (envelope-from sjg@FreeBSD.org)
Message-Id: <201411190709.sAJ79iRi048244@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org
 using -f
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Wed, 19 Nov 2014 07:09:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r274693 - projects/bmake/share/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Nov 2014 07:09:44 -0000

Author: sjg
Date: Wed Nov 19 07:09:43 2014
New Revision: 274693
URL: https://svnweb.freebsd.org/changeset/base/274693

Log:
  Use OBJTOP if defined

Modified:
  projects/bmake/share/mk/src.libnames.mk

Modified: projects/bmake/share/mk/src.libnames.mk
==============================================================================
--- projects/bmake/share/mk/src.libnames.mk	Wed Nov 19 07:09:14 2014	(r274692)
+++ projects/bmake/share/mk/src.libnames.mk	Wed Nov 19 07:09:43 2014	(r274693)
@@ -7,7 +7,11 @@
 .error src.libnames.mk cannot be included directly.
 .endif
 
+.if defined(OBJTOP)
+ROOTOBJDIR= ${OBJTOP}
+.else
 ROOTOBJDIR=	${.OBJDIR:S/${.CURDIR}//}${.MAKE.MAKEFILES:M*/src.libnames.mk:H:H:H}
+.endif
 
 LIBATF_CDIR=	${ROOTOBJDIR}/lib/atf/libatf-c
 LDATF_C?=	${LIBATF_CDIR}/libatf-c.so