svn commit: r265738 - head/share/mk

[Warner Losh]

Author: imp
Date: Fri May  9 04:49:48 2014
New Revision: 265738
URL: http://svnweb.freebsd.org/changeset/base/265738

Log:
  We have to include bsd.opts.mk (included in bsd.own.mk) after
  /etc/src.conf so that options set there will affect the options
  defined in bsd.opts.mk. Fix a few comments while I'm here.

Modified:
  head/share/mk/src.opts.mk

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Fri May  9 04:49:43 2014	(r265737)
+++ head/share/mk/src.opts.mk	Fri May  9 04:49:48 2014	(r265738)
@@ -30,17 +30,15 @@
 .if !target(__<src.opts.mk>__)
 __<src.opts.mk>__:
 
-# Compat -- needed still?
-.include <bsd.own.mk>
-
-# Allow user to configure things, but in the future this will move
-# elsehwere...
-
+# Allow user to configure things that only effect src tree builds.
 SRCCONF?=	/etc/src.conf
 .if exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf"
 .include "${SRCCONF}"
 .endif
 
+# Must be included after src.conf
+.include <bsd.own.mk>
+
 #
 # Define MK_* variables (which are either "yes" or "no") for users
 # to set via WITH_*/WITHOUT_* in /etc/src.conf and override in the