Date: Tue, 29 Jan 2013 00:11:22 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246048 - projects/bmake/share/mk Message-ID: <201301290011.r0T0BMgA074970@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301290011.r0T0BMgA074970>