From 69db934679baa1441dee62fb88273b6a68151663 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Thu, 8 Jun 2017 00:41:25 +0000 Subject: [PATCH] Fix src.conf.5 generation When makeman is generating src.conf(5) it tries to test all variation of options including WITH_DIRDEPS_BUILD. it results in an error when filemon(4) is not loaded. Export variables that are needed to prevent this behaviour. Helped by: sjg --- Makefile.inc1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 84018785333d..71b6db35a501 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2576,8 +2576,8 @@ check-old: check-old-files check-old-libs check-old-dirs .PHONY # showconfig - show build configuration. # showconfig: .PHONY - @(${MAKE} -n -f ${.CURDIR}/sys/conf/kern.opts.mk -V dummy -dg1; \ - ${MAKE} -n -f ${.CURDIR}/share/mk/src.opts.mk -V dummy -dg1) 2>&1 | grep ^MK_ | sort -u + @(${MAKE} -n -f ${.CURDIR}/sys/conf/kern.opts.mk -V dummy -dg1 UPDATE_DEPENDFILE=no NO_OBJ=yes; \ + ${MAKE} -n -f ${.CURDIR}/share/mk/src.opts.mk -V dummy -dg1 UPDATE_DEPENDFILE=no NO_OBJ=yes) 2>&1 | grep ^MK_ | sort -u .if !empty(KRNLOBJDIR) && !empty(KERNCONF) DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/