From 1c9b3241f2525c361abb8f2caa681af72168492e Mon Sep 17 00:00:00 2001 From: "Simon J. Gerraty" Date: Fri, 3 Jul 2015 06:10:09 +0000 Subject: [PATCH] Fix generation of src.conf.5 Since makeman turns all options on, we need to guard somethings from make(showconfig) --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 261e3b475488..de98c034fb8d 100644 --- a/Makefile +++ b/Makefile @@ -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.