diff options
| author | sheldonh <sheldonh@FreeBSD.org> | 2000-08-17 14:41:48 +0000 |
|---|---|---|
| committer | sheldonh <sheldonh@FreeBSD.org> | 2000-08-17 14:41:48 +0000 |
| commit | 8ec855315e8a2fb8fd60c8052fc1f36ecdceacc9 (patch) | |
| tree | 3f933692cd6ccc69e0542a5e751e85109a591a17 /share/mk | |
| parent | b157a8156045197f8dbc92614dd630137b564df8 (diff) | |
| download | FreeBSD-src-8ec855315e8a2fb8fd60c8052fc1f36ecdceacc9.zip FreeBSD-src-8ec855315e8a2fb8fd60c8052fc1f36ecdceacc9.tar.gz | |
The previous delta was wrong; an empty MAKEOBJDIRPREFIX should
cause the working directory to be used. Make it so.
When we're more convinced that it'll work, we might try this
to avoid a shell invocation:
.if defined(MAKEOBJDIRPREFIX) && !empty(MAKEOBJDIRPREFIX) &&
exists(${CANONICALOBJDIR}/)
Reported by: bde
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.obj.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk index 71f4660..4a68087 100644 --- a/share/mk/bsd.obj.mk +++ b/share/mk/bsd.obj.mk @@ -43,7 +43,7 @@ # create build directory. # -.if defined(MAKEOBJDIRPREFIX) && !empty(MAKEOBJDIRPREFIX) +.if defined(MAKEOBJDIRPREFIX) CANONICALOBJDIR:=${MAKEOBJDIRPREFIX}${.CURDIR} .else CANONICALOBJDIR:=/usr/obj${.CURDIR} @@ -97,7 +97,7 @@ whereobj: .endif cleanobj: - @if [ -d ${CANONICALOBJDIR}/ ]; then \ + @if [ -n ${MAKEOBJDIRPREFIX} -a -d ${CANONICALOBJDIR}/ ]; then \ rm -rf ${CANONICALOBJDIR}; \ else \ cd ${.CURDIR} && ${MAKE} clean cleandepend; \ |
