Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 10 Jun 2015 13:14:25 +0000 (UTC)
From:      "Simon J. Gerraty" <sjg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r284220 - projects/bmake/share/mk
Message-ID:  <201506101314.t5ADEP4e006453@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sjg
Date: Wed Jun 10 13:14:24 2015
New Revision: 284220
URL: https://svnweb.freebsd.org/changeset/base/284220

Log:
  Let people use this with MAKEOBJDIRPREFIX if they really want to

Modified:
  projects/bmake/share/mk/auto.obj.mk

Modified: projects/bmake/share/mk/auto.obj.mk
==============================================================================
--- projects/bmake/share/mk/auto.obj.mk	Wed Jun 10 13:08:45 2015	(r284219)
+++ projects/bmake/share/mk/auto.obj.mk	Wed Jun 10 13:14:24 2015	(r284220)
@@ -40,7 +40,10 @@ MKOBJDIRS= auto
 .if !defined(NOOBJ) && !defined(NO_OBJ) && ${MKOBJDIRS:Uno} == auto
 # Use __objdir here so it is easier to tweak without impacting
 # the logic.
-__objdir?= ${MAKEOBJDIR}
+.if !empty(MAKEOBJDIRPREFIX) && exists(${MAKEOBJDIRPREFIX})
+__objdir?= ${MAKEOBJDIRPREFIX}${.CURDIR}
+.endif
+__objdir?= ${MAKEOBJDIR:Uobj}
 __objdir:= ${__objdir:tA}
 .if ${.OBJDIR} != ${__objdir}
 # We need to chdir, make the directory if needed



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506101314.t5ADEP4e006453>