Date: Fri, 3 Jul 2015 06:10:09 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r285080 - head Message-ID: <201507030610.t636A94t086738@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sjg Date: Fri Jul 3 06:10:09 2015 New Revision: 285080 URL: https://svnweb.freebsd.org/changeset/base/285080 Log: Fix generation of src.conf.5 Since makeman turns all options on, we need to guard somethings from make(showconfig) Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Fri Jul 3 06:09:56 2015 (r285079) +++ head/Makefile Fri Jul 3 06:10:09 2015 (r285080) @@ -102,7 +102,7 @@ # Note: we use this awkward construct to be compatible with FreeBSD's # old make used in 10.0 and 9.2 and earlier. -.if defined(MK_META_MODE) && ${MK_META_MODE} == "yes" +.if defined(MK_META_MODE) && ${MK_META_MODE} == "yes" && !make(showconfig) # targets/Makefile plays the role of top-level .include "targets/Makefile" .else @@ -538,7 +538,9 @@ MK_META_MODE= no MK_STAGING= no # tell meta.autodep.mk to not even think about updating anything. UPDATE_DEPENDFILE= NO +.if !make(showconfig) .export MK_META_MODE MK_STAGING UPDATE_DEPENDFILE +.endif .if make(universe) # we do not want a failure of one branch abort all.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507030610.t636A94t086738>