From aad4718a0cb7e46be78169c5eeaa58f21b45ac07 Mon Sep 17 00:00:00 2001
From: oga <oga@openbsd.org>
Date: Fri, 21 Mar 2008 21:07:48 +0000
Subject: [PATCH] Install libdrm before libGL. That way if we're building X on
 a clean system with dri, libGL doesn't fail due to drm.h being missing.

ok matthieu@. Patch from Peter Hessler, thanks!
---
 lib/Makefile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/Makefile b/lib/Makefile
index 6d2a4d566..ea386c344 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2007/10/27 19:57:48 matthieu Exp $
+# $OpenBSD: Makefile,v 1.8 2008/03/21 21:07:48 oga Exp $
 
 SUBDIR= freetype fontconfig libxtrans libXau libXdmcp \
 	libX11  libXext  libXrender libXft libdmx libfontenc \
@@ -9,6 +9,13 @@ SUBDIR= freetype fontconfig libxtrans libXau libXdmcp \
 	libXprintAppUtil libXrandr libXRes libXScrnSaver libXTrap \
 	libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm
 
+DRM_ARCHES= alpha amd64 i386 macppc sparc64
+
+.for a in $(DRM_ARCHES)
+SUBDIR_$a+= libdrm
+.endfor
+SUBDIR+= $(SUBDIR_$(MACHINE))
+
 .if ${MACHINE} != "sgi" && ${MACHINE} != "vax"
 SUBDIR+= libGL libGLU libGLw
 .endif
@@ -18,13 +25,6 @@ SUBDIR+= libGL libGLU libGLw
 SUBDIR+= pixman
 .endif
 
-DRM_ARCHES= alpha amd64 i386 macppc sparc64
-
-.for a in $(DRM_ARCHES)
-SUBDIR_$a+= libdrm
-.endfor
-SUBDIR+= $(SUBDIR_$(MACHINE))
-
 .include <bsd.subdir.mk>
 
 build: _SUBDIRUSE