From 4e9d1b39099c1faa3d1bc0178596f08493ae00f9 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Sat, 16 Dec 2006 01:04:43 +0000
Subject: For reasons beyond my compressions, (b)make handles

.if foo || bar
BAZ=	no
.else
BAZ=	yes
.endif

different from

.if foo
BAZ=	no
.elif bar
BAZ=	no
.else
BAZ=	yes
.endif

in some situations exposed in this builtin.mk. Workaround this for now.
---
 x11/compositeproto/builtin.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'x11/compositeproto')

diff --git a/x11/compositeproto/builtin.mk b/x11/compositeproto/builtin.mk
index e03d9ec60e3..576e52af0fc 100644
--- a/x11/compositeproto/builtin.mk
+++ b/x11/compositeproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2006/12/15 20:43:00 joerg Exp $
+# $NetBSD: builtin.mk,v 1.4 2006/12/16 01:04:43 joerg Exp $
 
 BUILTIN_PKG:=	compositeproto
 
@@ -14,7 +14,9 @@ BUILTIN_FIND_FILES.H_COMPOSITEPROTO=	\
 ### Determine if there is a built-in implementation of the package and
 ### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
 ###
-.if !defined(IS_BUILTIN.compositeproto) || ${X11BASE} == ${LOCALBASE}
+.if ${X11BASE} == ${LOCALBASE}
+IS_BUILTIN.compositeproto=	no
+.elif !defined(IS_BUILTIN.compositeproto)
 IS_BUILTIN.compositeproto=	no
 #
 # Here, we skip checking whether the files are under ${LOCALBASE} since
-- 
cgit v1.2.3