Module Name: src
Committed By: apb
Date: Tue Jan 14 11:14:27 UTC 2014
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Use parentheses in .if A && ( B || C || D || ... )
To generate a diff of this commit:
cvs rdiff -u -r1.760 -r1.761 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.760 src/share/mk/bsd.own.mk:1.761
--- src/share/mk/bsd.own.mk:1.760 Tue Dec 31 18:46:09 2013
+++ src/share/mk/bsd.own.mk Tue Jan 14 11:14:27 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.760 2013/12/31 18:46:09 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.761 2014/01/14 11:14:27 apb Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -973,7 +973,7 @@ X11FLAVOUR?= Xorg
# Which platforms build the xorg-server drivers (as opposed
# to just Xnest and Xvfb.)
#
-.if ${X11FLAVOUR} == "Xorg" && \
+.if ${X11FLAVOUR} == "Xorg" && ( \
${MACHINE} == "alpha" || \
${MACHINE} == "amd64" || \
${MACHINE} == "bebox" || \
@@ -998,7 +998,7 @@ X11FLAVOUR?= Xorg
${MACHINE} == "sparc" || \
${MACHINE} == "sparc64" || \
${MACHINE} == "vax" || \
- ${MACHINE} == "zaurus"
+ ${MACHINE} == "zaurus" )
MKXORG_SERVER?=yes
.else
MKXORG_SERVER?=no
