make miniglx use libdrm properly

diff --git a/src/glx/mini/Makefile b/src/glx/mini/Makefile
index 3a95849..9503192 100644 (file)
--- a/src/glx/mini/Makefile
+++ b/src/glx/mini/Makefile
@@ -32,8 +32,7 @@ INCLUDE_DIRS = \
        -I$(TOP)/src/mesa/swrast \
        -I$(TOP)/src/mesa/swrast_setup \
        -I$(TOP)/src/mesa/drivers/dri/common \
-       -I$(DRM_SOURCE_PATH)/libdrm \
-       -I$(DRM_SOURCE_PATH)/shared
+       `pkg-config --cflags libdrm`
 
 
 ##### RULES #####

diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index f07dda3..b5e062f 100644 (file)
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -25,8 +25,7 @@ WINOBJ=
 WINLIB=-L$(MESA)/src/glx/mini
 MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini
 INCLUDES = $(MINIGLX_INCLUDES) \
-          -I$(DRM_SOURCE_PATH)/shared-core \
-          -I$(DRM_SOURCE_PATH)/libdrm \
+          `pkg-config --cflags libdrm` \
           $(SHARED_INCLUDES)
 
 OBJECTS = $(C_SOURCES:.c=.o) \
@@ -40,7 +39,7 @@ SHARED_INCLUDES = \
        -I. \
        -I$(TOP)/src/mesa/drivers/dri/common \
        -Iserver \
-       -I$(DRM_SOURCE_PATH)/shared-core \
+       `pkg-config --cflags libdrm` \
        -I$(TOP)/include \
        -I$(TOP)/include/GL/internal \
        -I$(TOP)/src/mesa \