diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2015-10-23 17:38:01 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2015-10-23 17:38:01 +0000 |
| commit | 4c620fe5c430f3a836da1c44ccb922a61b95a513 (patch) | |
| tree | 90f609aa8fbb06b6220e1227adcc383d6ee1e5c4 /contrib/bmake/mk/auto.obj.mk | |
| parent | db70df04c4e0ce48ddad20d1f065b594cf247621 (diff) | |
| parent | ce40971ce25292a0274be1ca4e5af0a73db78dd7 (diff) | |
| download | src-4c620fe5c430f3a836da1c44ccb922a61b95a513.tar.gz src-4c620fe5c430f3a836da1c44ccb922a61b95a513.zip | |
Merge bmake 20151020
Notes
Notes:
svn path=/head/; revision=289842
Diffstat (limited to 'contrib/bmake/mk/auto.obj.mk')
| -rw-r--r-- | contrib/bmake/mk/auto.obj.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/bmake/mk/auto.obj.mk b/contrib/bmake/mk/auto.obj.mk index e25a721cdf69..fee3de29b7d5 100644 --- a/contrib/bmake/mk/auto.obj.mk +++ b/contrib/bmake/mk/auto.obj.mk @@ -1,4 +1,4 @@ -# $Id: auto.obj.mk,v 1.10 2015/04/16 16:59:00 sjg Exp $ +# $Id: auto.obj.mk,v 1.11 2015/06/16 06:28:21 sjg Exp $ # # @(#) Copyright (c) 2004, Simon J. Gerraty # @@ -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 |