Skip to content

Commit 36cfe02

Browse files
committed
Fix generation of src.conf.5
Since makeman turns all options on, we need to guard somethings from make(showconfig)
1 parent 0db3cf1 commit 36cfe02

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102

103103
# Note: we use this awkward construct to be compatible with FreeBSD's
104104
# old make used in 10.0 and 9.2 and earlier.
105-
.if defined(MK_META_MODE) && ${MK_META_MODE} == "yes"
105+
.if defined(MK_META_MODE) && ${MK_META_MODE} == "yes" && !make(showconfig)
106106
# targets/Makefile plays the role of top-level
107107
.include "targets/Makefile"
108108
.else
@@ -538,7 +538,9 @@ MK_META_MODE= no
538538
MK_STAGING= no
539539
# tell meta.autodep.mk to not even think about updating anything.
540540
UPDATE_DEPENDFILE= NO
541+
.if !make(showconfig)
541542
.export MK_META_MODE MK_STAGING UPDATE_DEPENDFILE
543+
.endif
542544

543545
.if make(universe)
544546
# we do not want a failure of one branch abort all.

0 commit comments

Comments
 (0)