Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

[mesa.git] / src / gallium / winsys / xlib / Makefile

diff --git a/src/gallium/winsys/xlib/Makefile b/src/gallium/winsys/xlib/Makefile
index 522f6dc5aee0991cba36a4de45bfb91a70008f01..a0293fe9b4b0a9399ec619d796df813f4a93f6d0 100644 (file)
--- a/src/gallium/winsys/xlib/Makefile
+++ b/src/gallium/winsys/xlib/Makefile
@@ -31,9 +31,7 @@ DEFINES += \
 XLIB_WINSYS_SOURCES = \
        xlib.c \
        xlib_cell.c \
-       xlib_brw_aub.c \
-       xlib_brw_context.c \
-       xlib_brw_screen.c \
+       xlib_llvmpipe.c \
        xlib_softpipe.c \
        xlib_trace.c 
 
@@ -86,11 +84,11 @@ depend: $(XLIB_WINSYS_SOURCES)
 
 
 install: default
-       $(INSTALL) -d $(INSTALL_DIR)/include/GL
-       $(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR)
-       $(INSTALL) -m 644 $(TOP)/include/GL/*.h $(INSTALL_DIR)/include/GL
+       $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL
+       $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
+       $(INSTALL) -m 644 $(TOP)/include/GL/*.h $(DESTDIR)$(INSTALL_DIR)/include/GL
        @if [ -e $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) ]; then \
-               $(MINSTALL) $(TOP)/$(LIB_DIR)/libGL* $(INSTALL_DIR)/$(LIB_DIR); \
+               $(MINSTALL) $(TOP)/$(LIB_DIR)/libGL* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR); \
        fi