From owner-svn-src-projects@FreeBSD.ORG  Tue Jan 29 00:11:22 2013
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])
 by hub.freebsd.org (Postfix) with ESMTP id 458B9815;
 Tue, 29 Jan 2013 00:11:22 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 38A5F8F4;
 Tue, 29 Jan 2013 00:11:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0T0BMv2074971;
 Tue, 29 Jan 2013 00:11:22 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0T0BMgA074970;
 Tue, 29 Jan 2013 00:11:22 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201301290011.r0T0BMgA074970@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Tue, 29 Jan 2013 00:11:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r246048 - 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.14
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: Tue, 29 Jan 2013 00:11:22 -0000

Author: sjg
Date: Tue Jan 29 00:11:21 2013
New Revision: 246048
URL: http://svnweb.freebsd.org/changeset/base/246048

Log:
  Use STAGE_OBJTOP for STAGE_SYMLINKS_DIR etc

Modified:
  projects/bmake/share/mk/local.sys.mk

Modified: projects/bmake/share/mk/local.sys.mk
==============================================================================
--- projects/bmake/share/mk/local.sys.mk	Tue Jan 29 00:10:05 2013	(r246047)
+++ projects/bmake/share/mk/local.sys.mk	Tue Jan 29 00:11:21 2013	(r246048)
@@ -94,11 +94,15 @@ WITH_AUTO_OBJ= yes
 .include <auto.obj.mk>
 .endif
 
+# the logic in bsd.own.mk forces this dance
 .ifndef WITHOUT_META_MODE
 WITH_META_MODE= yes
 
 .ifndef WITHOUT_STAGING
 WITH_STAGING= yes
+.ifndef WITHOUT_STAGING_PROG
+WITH_STAGING_PROG= yes
+.endif
 .endif
 
 PYTHON ?= /usr/local/bin/python
@@ -134,6 +138,8 @@ STAGE_HOST_OBJTOP= ${STAGE_ROOT}/${HOST_
 STAGE_LIBDIR= ${STAGE_OBJTOP}${LIBDIR:U/lib}
 # this is not the same as INCLUDEDIR
 STAGE_INCSDIR= ${STAGE_OBJTOP}${INCSDIR:U/include}
+# the target is usually an absolute path
+STAGE_SYMLINKS_DIR= ${STAGE_OBJTOP}
 
 .ifndef WITH_SYSROOT
 .if ${MACHINE} != "host"