diff options
| author | Marcel Moolenaar <marcel@FreeBSD.org> | 2012-08-22 19:25:57 +0000 |
|---|---|---|
| committer | Marcel Moolenaar <marcel@FreeBSD.org> | 2012-08-22 19:25:57 +0000 |
| commit | 7750ad47a9a7dbc83f87158464170c8640723293 (patch) | |
| tree | cd79e2918968cd4506cfed6dbf7f1829c11aa985 /share/mk/bsd.obj.mk | |
| parent | e43b47e8f430b87d4bb6a2c798216568483ab8c2 (diff) | |
| download | src-7750ad47a9a7dbc83f87158464170c8640723293.tar.gz src-7750ad47a9a7dbc83f87158464170c8640723293.zip | |
Sync FreeBSD's bmake branch with Juniper's internal bmake branch.
Requested by: Simon Gerraty <sjg@juniper.net>
Notes
Notes:
svn path=/projects/bmake/; revision=239572
Diffstat (limited to 'share/mk/bsd.obj.mk')
| -rw-r--r-- | share/mk/bsd.obj.mk | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk index bd8f2aabc218..38afcde9a35f 100644 --- a/share/mk/bsd.obj.mk +++ b/share/mk/bsd.obj.mk @@ -44,10 +44,21 @@ __<bsd.obj.mk>__: .if defined(MAKEOBJDIRPREFIX) CANONICALOBJDIR:=${MAKEOBJDIRPREFIX}${.CURDIR} +.elif defined(MAKEOBJDIR) && ${MAKEOBJDIR:M/*} != "" +CANONICALOBJDIR:=${MAKEOBJDIR} .else CANONICALOBJDIR:=/usr/obj${.CURDIR} .endif +.if defined(.PARSEDIR) && !defined(NO_OBJ) && !defined(NO_AUTO_OBJ) +.if ${MK_AUTO_OBJ} == "yes" +__objdir?= ${CANONICALOBJDIR} +# this is what auto.obj.mk wants to see +MKOBJDIRS=auto +.include "auto.obj.mk" +.endif +.endif + # # Warn of unorthodox object directory. # @@ -116,6 +127,11 @@ cleanobj: clean cleandepend .endif @if [ -L ${.CURDIR}/obj ]; then rm -f ${.CURDIR}/obj; fi +# Tell bmake not to look for generated files via .PATH +.if !empty(CLEANFILES) +.NOPATH: ${CLEANFILES} +.endif + .if !target(clean) clean: .if defined(CLEANFILES) && !empty(CLEANFILES) |