summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorsjg <sjg@FreeBSD.org>2015-07-03 06:10:09 +0000
committersjg <sjg@FreeBSD.org>2015-07-03 06:10:09 +0000
commit36cfe02ee52f69c2c88dcac3dea054601704039b (patch)
tree7f8c9d2628da0766745915956e22bca9c97987b3 /Makefile
parent0db3cf1b6e34195e4738ac320e284c43b559a63a (diff)
downloadFreeBSD-src-36cfe02ee52f69c2c88dcac3dea054601704039b.zip
FreeBSD-src-36cfe02ee52f69c2c88dcac3dea054601704039b.tar.gz
Fix generation of src.conf.5
Since makeman turns all options on, we need to guard somethings from make(showconfig)
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 261e3b4..de98c03 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.
OpenPOWER on IntegriCloud