diff options
| author | ru <ru@FreeBSD.org> | 2004-12-21 08:47:35 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2004-12-21 08:47:35 +0000 |
| commit | cec60429bbb77a84c44199253f4a9d1a628fcc2a (patch) | |
| tree | 7f8ff4b9f5ceced931324bf379fadaf03c3f07ea /share/mk/bsd.obj.mk | |
| parent | 8a8ad0dddfa253e5daf138f2193095556257d0ce (diff) | |
| download | FreeBSD-src-cec60429bbb77a84c44199253f4a9d1a628fcc2a.zip FreeBSD-src-cec60429bbb77a84c44199253f4a9d1a628fcc2a.tar.gz | |
Start the dreaded NOFOO -> NO_FOO conversion.
OK'ed by: core
Diffstat (limited to 'share/mk/bsd.obj.mk')
| -rw-r--r-- | share/mk/bsd.obj.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk index 40735ae..40c676b 100644 --- a/share/mk/bsd.obj.mk +++ b/share/mk/bsd.obj.mk @@ -23,7 +23,7 @@ # # E.g. use `env MAKEOBJDIRPREFIX=/somewhere/obj make' # -# NOOBJ Do not create object directories. This should not be set +# NO_OBJ Do not create object directories. This should not be set # if anything is built. # # +++ targets +++ @@ -65,7 +65,7 @@ CANONICALOBJDIR:=/usr/obj${.CURDIR} # issue a warning differentiating between cases 6 and (3 or 4). # objwarn: -.if !defined(NOOBJ) && ${.OBJDIR} != ${CANONICALOBJDIR} && \ +.if !defined(NO_OBJ) && ${.OBJDIR} != ${CANONICALOBJDIR} && \ !(defined(MAKEOBJDIRPREFIX) && exists(${CANONICALOBJDIR}/)) && \ !(defined(MAKEOBJDIR) && exists(${MAKEOBJDIR}/)) .if ${.OBJDIR} == ${.CURDIR} @@ -76,7 +76,7 @@ objwarn: .endif .endif -.if !defined(NOOBJ) +.if !defined(NO_OBJ) .if !target(obj) obj: .PHONY @if ! test -d ${CANONICALOBJDIR}/; then \ @@ -98,7 +98,7 @@ objlink: echo "No ${CANONICALOBJDIR} to link to - do a make obj."; \ fi .endif -.endif !defined(NOOBJ) +.endif !defined(NO_OBJ) # # where would that obj directory be? |
