d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix generation of src.conf.5

Browse Source 
Since makeman turns all options on, we need to guard somethings from
make(showconfig)
This commit is contained in:
Simon J. Gerraty 2015-07-03 06:10:09 +00:00
parent b14a705362
commit 1c9b3241f2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -102,7 +102,7 @@
# Note: we use this awkward construct to be compatible with FreeBSD's # Note: we use this awkward construct to be compatible with FreeBSD's
# old make used in 10.0 and 9.2 and earlier. # 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 # targets/Makefile plays the role of top-level
.include "targets/Makefile" .include "targets/Makefile"
.else .else
@ -538,7 +538,9 @@ MK_META_MODE= no
MK_STAGING= no MK_STAGING= no
# tell meta.autodep.mk to not even think about updating anything. # tell meta.autodep.mk to not even think about updating anything.
UPDATE_DEPENDFILE= NO UPDATE_DEPENDFILE= NO
.if !make(showconfig)
.export MK_META_MODE MK_STAGING UPDATE_DEPENDFILE .export MK_META_MODE MK_STAGING UPDATE_DEPENDFILE
.endif
.if make(universe) .if make(universe)
# we do not want a failure of one branch abort all. # we do not want a failure of one branch abort all.