Module Name:	pkgsrc
Committed By:	joerg
Date:		Sat Dec 16 01:04:43 UTC 2006

Modified Files:
	pkgsrc/x11/compositeproto: builtin.mk
	pkgsrc/x11/fixesproto: builtin.mk
	pkgsrc/x11/randrproto: builtin.mk
	pkgsrc/x11/renderproto: builtin.mk
	pkgsrc/x11/xextproto: builtin.mk
	pkgsrc/x11/xproto: builtin.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 pkgsrc/x11/compositeproto/builtin.mk
cvs rdiff -r1.4 -r1.5 pkgsrc/x11/fixesproto/builtin.mk
cvs rdiff -r1.2 -r1.3 pkgsrc/x11/randrproto/builtin.mk
cvs rdiff -r1.5 -r1.6 pkgsrc/x11/renderproto/builtin.mk
cvs rdiff -r1.2 -r1.3 pkgsrc/x11/xextproto/builtin.mk
cvs rdiff -r1.2 -r1.3 pkgsrc/x11/xproto/builtin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.