summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11/compositeproto/builtin.mk4
-rw-r--r--x11/fixesproto/builtin.mk4
-rw-r--r--x11/randrproto/builtin.mk4
-rw-r--r--x11/renderproto/builtin.mk4
-rw-r--r--x11/xextproto/builtin.mk4
-rw-r--r--x11/xproto/builtin.mk4
6 files changed, 12 insertions, 12 deletions
diff --git a/x11/compositeproto/builtin.mk b/x11/compositeproto/builtin.mk
index 4bda60f587b..e03d9ec60e3 100644
--- a/x11/compositeproto/builtin.mk
+++ b/x11/compositeproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2006/04/19 12:27:02 reed Exp $
+# $NetBSD: builtin.mk,v 1.3 2006/12/15 20:43:00 joerg Exp $
BUILTIN_PKG:= compositeproto
@@ -14,7 +14,7 @@ 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)
+.if !defined(IS_BUILTIN.compositeproto) || ${X11BASE} == ${LOCALBASE}
IS_BUILTIN.compositeproto= no
#
# Here, we skip checking whether the files are under ${LOCALBASE} since
diff --git a/x11/fixesproto/builtin.mk b/x11/fixesproto/builtin.mk
index dc264340dfc..3b746d51f44 100644
--- a/x11/fixesproto/builtin.mk
+++ b/x11/fixesproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2006/04/19 12:27:02 reed Exp $
+# $NetBSD: builtin.mk,v 1.4 2006/12/15 20:43:00 joerg Exp $
BUILTIN_PKG:= fixesproto
@@ -14,7 +14,7 @@ BUILTIN_FIND_FILES.H_XFIXESWIRE= \
### Determine if there is a built-in implementation of the package and
### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
###
-.if !defined(IS_BUILTIN.fixesproto)
+.if !defined(IS_BUILTIN.fixesproto) || ${X11BASE} == ${LOCALBASE}
IS_BUILTIN.fixesproto= no
#
# Here, we skip checking whether the files are under ${LOCALBASE} since
diff --git a/x11/randrproto/builtin.mk b/x11/randrproto/builtin.mk
index 07b89c7b225..3733d4dd1e4 100644
--- a/x11/randrproto/builtin.mk
+++ b/x11/randrproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1.1.1 2006/04/18 17:14:45 reed Exp $
+# $NetBSD: builtin.mk,v 1.2 2006/12/15 20:43:00 joerg Exp $
# TODO: builtin.mk failed to use native on XFree86
# the two headers are identical with native XFree86
@@ -14,7 +14,7 @@ BUILTIN_FIND_FILES.H_RANDR= ${X11BASE}/include/X11/extensions/randr.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.randrproto)
+.if !defined(IS_BUILTIN.randrproto) || ${X11BASE} == ${LOCALBASE}
IS_BUILTIN.randrproto= no
#
# Here, we skip checking whether the files are under ${LOCALBASE} since
diff --git a/x11/renderproto/builtin.mk b/x11/renderproto/builtin.mk
index af6c3ec7ed7..1ab7bee5849 100644
--- a/x11/renderproto/builtin.mk
+++ b/x11/renderproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2006/07/22 04:51:29 rillig Exp $
+# $NetBSD: builtin.mk,v 1.5 2006/12/15 20:43:00 joerg Exp $
BUILTIN_PKG:= renderproto
@@ -11,7 +11,7 @@ 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)
+.if !defined(IS_BUILTIN.renderproto) || ${X11BASE} == ${LOCALBASE}
IS_BUILTIN.renderproto= no
#
# Here, we skip checking whether the files are under ${LOCALBASE} since
diff --git a/x11/xextproto/builtin.mk b/x11/xextproto/builtin.mk
index 4a384924dd5..9386fa105b2 100644
--- a/x11/xextproto/builtin.mk
+++ b/x11/xextproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1.1.1 2006/04/18 17:12:12 reed Exp $
+# $NetBSD: builtin.mk,v 1.2 2006/12/15 20:43:01 joerg Exp $
BUILTIN_PKG:= xextproto
@@ -12,7 +12,7 @@ BUILTIN_FIND_FILES.H_XEXTPROTO= \
### Determine if there is a built-in implementation of the package and
### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
###
-.if !defined(IS_BUILTIN.xextproto)
+.if !defined(IS_BUILTIN.xextproto) || ${X11BASE} == ${LOCALBASE}
IS_BUILTIN.xextproto= no
#
# Here, we skip checking whether the files are under ${LOCALBASE} since
diff --git a/x11/xproto/builtin.mk b/x11/xproto/builtin.mk
index 280cba2845a..1aa057b7ce9 100644
--- a/x11/xproto/builtin.mk
+++ b/x11/xproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2006/04/19 12:19:47 reed Exp $
+# $NetBSD: builtin.mk,v 1.2 2006/12/15 20:43:01 joerg Exp $
BUILTIN_PKG:= xproto
@@ -11,7 +11,7 @@ BUILTIN_FIND_FILES.H_XFUNCPROTO= ${X11BASE}/include/X11/Xfuncproto.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.xproto)
+.if !defined(IS_BUILTIN.xproto) || ${X11BASE} == ${LOCALBASE}
IS_BUILTIN.xproto= no
. if empty(H_XFUNCPROTO:M__nonexistent__)
IS_BUILTIN.xproto= yes