summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2007-12-20 06:52:04 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2007-12-20 06:52:04 +0000
commitcd4dc0d1c6da0db9334588c9402b9bc0b8f7ad6c (patch)
tree60b7796051490f397b09f80840340d40353fb8e8
parentcc4f35ed018ce1d03edd3d1eee2bd8997ed7b391 (diff)
Don't try to build xserver on landisk. it now depends on lib/pixman
which doesn't build because of gcc problems.
-rw-r--r--Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 970a9ba0f..e81d0f641 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2007/10/27 20:01:23 matthieu Exp $
+# $OpenBSD: Makefile,v 1.23 2007/12/20 06:52:03 matthieu Exp $
.include <bsd.own.mk>
LOCALAPPD=/usr/local/lib/X11/app-defaults
@@ -7,7 +7,11 @@ REALAPPD=/etc/X11/app-defaults
XCONFIG=${XSRCDIR}/etc/X11.${MACHINE}/xorg.conf
RM?=rm
-SUBDIR= proto data/bitmaps lib app data/xkbdata xserver driver util doc
+.if ${MACHINE_ARCH} != "sh"
+XSERVER= xserver
+.endif
+
+SUBDIR= proto data/bitmaps lib app data/xkbdata ${XSERVER} driver util doc
.ifndef NOFONTS
SUBDIR+= font
.endif