Module Name: src
Committed By: uebayasi
Date: Sun Dec 6 16:15:15 UTC 2009
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Simplify how MKZFS is set. No functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.602 -r1.603 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.602 src/share/mk/bsd.own.mk:1.603
--- src/share/mk/bsd.own.mk:1.602 Fri Dec 4 11:21:07 2009
+++ src/share/mk/bsd.own.mk Sun Dec 6 16:15:15 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.602 2009/12/04 11:21:07 haad Exp $
+# $NetBSD: bsd.own.mk,v 1.603 2009/12/06 16:15:15 uebayasi Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -663,6 +663,13 @@
.endif
#
+# We want to build zfs only for i386 and amd64 by default for now.
+#
+.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
+MKZFS?= yes
+.endif
+
+#
# MK* options which default to "yes".
#
_MKVARS.yes= \
@@ -698,7 +705,7 @@
MKMANDOC MKMANZ MKOBJDIRS \
MKPCC MKPCCCMDS \
MKSOFTFLOAT MKSTRIPIDENT \
- MKUNPRIVED MKUPDATE MKX11
+ MKUNPRIVED MKUPDATE MKX11 MKZFS
.for var in ${_MKVARS.no}
${var}?=no
.endfor
@@ -720,17 +727,6 @@
.endif
#
-# We want to build zfs only for i386 and amd64 by default for now.
-#
-.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
-MKZFS?= yes
-_MKVARS.yes+= MKZFS
-.else
-MKZFS?= no
-_MKVARS.no+= MKZFS
-.endif
-
-#
# Force some options off if their dependencies are off.
#
