[src/trunk]: src/external/mit/xorg updates for changed header locations for l...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8101b39bf3ba
branches:  trunk
changeset: 755109:8101b39bf3ba
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat May 22 22:50:23 2010 +0000

description:
updates for changed header locations for libdrm.

diffstat:

 external/mit/xorg/lib/libGL/Makefile                          |  4 ++--
 external/mit/xorg/server/xorg-server/glx/Makefile.glx         |  4 ++--
 external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile  |  4 ++--
 external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile |  4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diffs (72 lines):

diff -r dd82f55eeb87 -r 8101b39bf3ba external/mit/xorg/lib/libGL/Makefile
--- a/external/mit/xorg/lib/libGL/Makefile      Sat May 22 22:48:18 2010 +0000
+++ b/external/mit/xorg/lib/libGL/Makefile      Sat May 22 22:50:23 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2010/05/22 08:52:34 mrg Exp $
+#      $NetBSD: Makefile,v 1.12 2010/05/22 22:50:23 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -57,7 +57,7 @@
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/GL \
                -I${DESTDIR}${X11INCDIR}/X11 \
                -I${DESTDIR}${X11INCDIR}/X11/extensions \
-               -I${DESTDIR}${X11INCDIR}/drm \
+               -I${DESTDIR}${X11INCDIR}/libdrm \
                -I${X11SRCDIR.MesaLib}/include \
                -I${X11SRCDIR.MesaLib}/include/GL/internal \
                -I${X11SRCDIR.MesaLib}/src/mesa \
diff -r dd82f55eeb87 -r 8101b39bf3ba external/mit/xorg/server/xorg-server/glx/Makefile.glx
--- a/external/mit/xorg/server/xorg-server/glx/Makefile.glx     Sat May 22 22:48:18 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/glx/Makefile.glx     Sat May 22 22:50:23 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.glx,v 1.4 2009/10/08 19:06:52 snj Exp $
+#      $NetBSD: Makefile.glx,v 1.5 2010/05/22 22:50:23 mrg Exp $
 
 .PATH: ${X11SRCDIR.xorg-server}/glx
 .PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi
@@ -52,7 +52,7 @@
        -I${X11SRCDIR.MesaLib}/src/mesa/main \
        -I${X11SRCDIR.MesaLib}/src/mesa/glapi \
        -I${DESTDIR}${X11INCDIR}/X11 \
-       -I${DESTDIR}${X11INCDIR}/drm \
+       -I${DESTDIR}${X11INCDIR}/libdrm \
        -I${DESTDIR}${X11INCDIR}/xorg \
        -I${DESTDIR}${X11INCDIR}/pixman-1
 
diff -r dd82f55eeb87 -r 8101b39bf3ba external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile      Sat May 22 22:48:18 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile      Sat May 22 22:50:23 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/05/22 05:45:02 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2010/05/22 22:50:23 mrg Exp $
 
 XMODULEDIR=    ${X11USRLIBDIR}/modules/extensions
 
@@ -26,7 +26,7 @@
                -I${X11SRCDIR.MesaLib}/include \
                -I${DESTDIR}${X11INCDIR}/X11 \
                -I${DESTDIR}${X11INCDIR}/X11/dri \
-               -I${DESTDIR}${X11INCDIR}/drm \
+               -I${DESTDIR}${X11INCDIR}/libdrm \
                -I${DESTDIR}${X11INCDIR}/pixman-1 \
                -I${DESTDIR}${X11INCDIR}/xorg
 
diff -r dd82f55eeb87 -r 8101b39bf3ba external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile     Sat May 22 22:48:18 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile     Sat May 22 22:50:23 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/10/08 19:06:52 snj Exp $
+# $NetBSD: Makefile,v 1.5 2010/05/22 22:50:23 mrg Exp $
 
 XMODULEDIR=    ${X11USRLIBDIR}/modules/extensions
 
@@ -27,7 +27,7 @@
                -I${X11SRCDIR.MesaLib}/include \
                -I${DESTDIR}${X11INCDIR}/X11 \
                -I${DESTDIR}${X11INCDIR}/X11/dri \
-               -I${DESTDIR}${X11INCDIR}/drm \
+               -I${DESTDIR}${X11INCDIR}/libdrm \
                -I${DESTDIR}${X11INCDIR}/pixman-1 \
                -I${DESTDIR}${X11INCDIR}/xorg