Re: CVS commit: src/share/mk

[Masao Uebayashi <uebayasi%tombi.co.jp@localhost>]

Maybe this is simpler:

        sidebeach% nbmake-i386 -V MKZFS
        yes
        sidebeach% nbmake-i386 -V MKZFS MKZFS=no
        no
        sidebeach% nbmake-shark -V MKZFS
        no
        sidebeach% nbmake-shark -V MKZFS MKZFS=yes
        yes

Masao

Index: share/mk/bsd.own.mk
===================================================================
RCS file: /cvsroot/src/share/mk/bsd.own.mk,v
retrieving revision 1.601
diff -u -r1.601 bsd.own.mk
--- share/mk/bsd.own.mk 3 Dec 2009 15:57:18 -0000       1.601
+++ share/mk/bsd.own.mk 4 Dec 2009 03:41:12 -0000
@@ -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= \
@@ -699,7 +706,7 @@
        MKMANDOC MKMANZ MKOBJDIRS \
        MKPCC MKPCCCMDS \
        MKSOFTFLOAT MKSTRIPIDENT \
-       MKUNPRIVED MKUPDATE MKX11 
+       MKUNPRIVED MKUPDATE MKX11 MKZFS
 .for var in ${_MKVARS.no}
 ${var}?=no
 .endfor
@@ -721,17 +728,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.
 #
 
-- 
Masao Uebayashi / Tombi Inc. / Tel: +81-90-9141-4635