diff options
| author | joerg <joerg> | 2006-12-16 01:04:43 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-12-16 01:04:43 +0000 |
| commit | 99eeb6753d6478028a21673bc9091c3dfe6ff862 (patch) | |
| tree | 8758e54ae51b35e5ba067ba811b5c7c3d433751e /x11/renderproto | |
| parent | 1dc212eae85a541e5bd7369724cea287d15b46ba (diff) | |
| download | pkgsrc-99eeb6753d6478028a21673bc9091c3dfe6ff862.tar.gz | |
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.
Diffstat (limited to 'x11/renderproto')
| -rw-r--r-- | x11/renderproto/builtin.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/x11/renderproto/builtin.mk b/x11/renderproto/builtin.mk index 1ab7bee5849..b3930286947 100644 --- a/x11/renderproto/builtin.mk +++ b/x11/renderproto/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.5 2006/12/15 20:43:00 joerg Exp $ +# $NetBSD: builtin.mk,v 1.6 2006/12/16 01:04:43 joerg Exp $ BUILTIN_PKG:= renderproto @@ -11,7 +11,9 @@ BUILTIN_FIND_FILES.H_RENDER= ${X11BASE}/include/X11/extensions/render.h ### Determine if there is a built-in implementation of the package and ### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). ### -.if !defined(IS_BUILTIN.renderproto) || ${X11BASE} == ${LOCALBASE} +.if ${X11BASE} == ${LOCALBASE} +IS_BUILTIN.renderproto= no +.elif !defined(IS_BUILTIN.xproto) IS_BUILTIN.renderproto= no # # Here, we skip checking whether the files are under ${LOCALBASE} since |