svn commit: r264045 - head/share/mk

[Warner Losh]

Author: imp
Date: Wed Apr  2 16:33:10 2014
New Revision: 264045
URL: http://svnweb.freebsd.org/changeset/base/264045

Log:
  Move setting of the MK_xxx variables based on NO_xxx to avoid
  triggering the "you aren't allowed to set this" warning when building
  stand alone in directories whose Makefile sets NO_MAN, for example.

Modified:
  head/share/mk/bsd.own.mk

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Wed Apr  2 16:33:02 2014	(r264044)
+++ head/share/mk/bsd.own.mk	Wed Apr  2 16:33:10 2014	(r264045)
@@ -219,21 +219,6 @@ COMPRESS_EXT?=	.gz
 #
 
 #
-# Supported NO_* options (if defined, MK_* will be forced to "no",
-# regardless of user's setting).
-#
-.for var in \
-    CTF \
-    DEBUG_FILES \
-    INSTALLLIB \
-    MAN \
-    PROFILE
-.if defined(NO_${var})
-MK_${var}:=no
-.endif
-.endfor
-
-#
 # Older-style variables that enabled behaviour when set.
 #
 .if defined(YES_HESIOD)
@@ -466,6 +451,22 @@ MK_${var}:=	no
 .endfor
 .undef __DEFAULT_NO_OPTIONS
 
+
+#
+# Supported NO_* options (if defined, MK_* will be forced to "no",
+# regardless of user's setting).
+#
+.for var in \
+    CTF \
+    DEBUG_FILES \
+    INSTALLLIB \
+    MAN \
+    PROFILE
+.if defined(NO_${var})
+MK_${var}:=no
+.endif
+.endfor
+
 #
 # Force some options off if their dependencies are off.
 # Order is somewhat important.