svn commit: r273418 - head

[Warner Losh]

Author: imp
Date: Tue Oct 21 20:29:51 2014
New Revision: 273418
URL: https://svnweb.freebsd.org/changeset/base/273418

Log:
  Generate both userland and kernel option settings for showconfig.
  
  PR: 191920

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Oct 21 20:29:42 2014	(r273417)
+++ head/Makefile.inc1	Tue Oct 21 20:29:51 2014	(r273418)
@@ -1886,7 +1886,8 @@ check-old: check-old-files check-old-lib
 # showconfig - show build configuration.
 #
 showconfig:
-	@${MAKE} -n -f src.opts.mk -V dummy -dg1 2>&1 | grep ^MK_ | sort
+	@(${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
 
 .if !empty(KRNLOBJDIR) && !empty(KERNCONF)
 DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/