diff options
| author | joerg <joerg@pkgsrc.org> | 2006-12-16 01:04:43 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-12-16 01:04:43 +0000 |
| commit | 885840b477991e734cc651edce4def01bc52580f (patch) | |
| tree | 8758e54ae51b35e5ba067ba811b5c7c3d433751e /x11/compositeproto | |
| parent | ccb80c8ae216573374563de9fcf2f1f7c37421cd (diff) | |
| download | pkgsrc-885840b477991e734cc651edce4def01bc52580f.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/compositeproto')
| -rw-r--r-- | x11/compositeproto/builtin.mk | 6 |
1 files changed, 4 insertions, 2 deletions
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 |