From 2d79d6273512ccdef06178b233333c7ea44e486e Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu@cvs.openbsd.org>
Date: Thu, 4 Jun 2009 01:12:45 +0000
Subject: simplify.

---
 share/mk/bsd.xconf.mk | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'share/mk')

diff --git a/share/mk/bsd.xconf.mk b/share/mk/bsd.xconf.mk
index c985e1317..3de4238d4 100644
--- a/share/mk/bsd.xconf.mk
+++ b/share/mk/bsd.xconf.mk
@@ -1,20 +1,15 @@
-# $OpenBSD: bsd.xconf.mk,v 1.9 2009/05/22 17:58:45 matthieu Exp $
+# $OpenBSD: bsd.xconf.mk,v 1.10 2009/06/04 01:12:44 matthieu Exp $
 
 # Shared libs?
-.if ${MACHINE} == "mvme88k" || ${MACHINE} == "vax"
+.if ${MACHINE_ARCH} == "m88k" || ${MACHINE} == "vax"
 XENOCARA_HAVE_SHARED_LIBS?=no
 .else
 XENOCARA_HAVE_SHARED_LIBS?=yes
 .endif
 
-# Build GL libs and apps
-.if ${MACHINE_ARCH} == "m88k" || ${MACHINE} == vax
-XENOCARA_BUILD_GL?=no
-XENOCARA_BUILD_DRI?=no
-.else
-XENOCARA_BUILD_GL?=yes
-XENOCARA_BUILD_DRI?=yes
-.endif
+# Build GL libs and apps?
+XENOCARA_BUILD_GL?=${XENOCARA_HAVE_SHARED_LIBS:L}
+XENOCARA_BUILD_DRI?=${XENOCARA_HAVE_SHARED_LIBS:L}
 
 # Build XCB
 XENOCARA_BUILD_XCB?=no
-- 
cgit v1.2.3