Skip to content

Commit

Permalink
Fix makeman creating obj directories due to turning on WITH_AUTO_OBJ.
Browse files Browse the repository at this point in the history
r284708 addressed this slightly but seems to have put the make(showconfig)
guard in the wrong place.  Rather than guard setting the default obj directory,
guard inclusion of auto.obj.mk.  This avoids creating SRCTOP/obj and
SRCTOP/release/obj when running makeman.

Sponsored by:	EMC / Isilon Storage Division
  • Loading branch information
bdrewery committed Sep 17, 2015
1 parent e4c53d3 commit 66e5857
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 0 additions & 2 deletions share/mk/local.meta.sys.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ MK_INSTALL_AS_USER= yes
_default_makeobjdir=$${.CURDIR:S,^$${SRCTOP},$${OBJTOP},}

.if empty(OBJROOT) || ${.MAKE.LEVEL} == 0
.if !make(showconfig)
.if defined(MAKEOBJDIRPREFIX)
# put things approximately where they want
OBJROOT:=${MAKEOBJDIRPREFIX}${SRCTOP}/
Expand All @@ -25,7 +24,6 @@ MAKEOBJDIR=${_default_makeobjdir}
# Expand for our own use
MAKEOBJDIR:= ${MAKEOBJDIR}
.endif
.endif
.if !empty(SB)
SB_OBJROOT ?= ${SB}/obj/
# this is what we use below
Expand Down
4 changes: 2 additions & 2 deletions share/mk/sys.mk
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ __DEFAULT_DEPENDENT_OPTIONS= \
.endif
.if ${MK_AUTO_OBJ} == "yes"
# This needs to be done early - before .PATH is computed
# Don't do this if just running make -V
.if ${.MAKEFLAGS:M-V} == ""
# Don't do this if just running 'make -V' or 'make showconfig'
.if ${.MAKEFLAGS:M-V} == "" && !make(showconfig)
.sinclude <auto.obj.mk>
.endif
.endif
Expand Down

0 comments on commit 66e5857

Please sign in to comment.