Merge branch 'master' into drm-gem

[mesa.git] / src / mesa / drivers / dri / Makefile

diff --git a/src/mesa/drivers/dri/Makefile b/src/mesa/drivers/dri/Makefile
index 1db878bab70d03e551b098f87aa1f824e181456c..3b3fcf11df118f8f29047ed684e1a52b59df2575 100644 (file)
--- a/src/mesa/drivers/dri/Makefile
+++ b/src/mesa/drivers/dri/Makefile
@@ -14,21 +14,43 @@ $(TOP)/$(LIB_DIR):
 
 
 subdirs:
-       echo $(DRI_DIRS)
        @for dir in $(DRI_DIRS) ; do \
-               echo $$dir ; \
-               (cd $$dir && $(MAKE)) || exit 1; \
+               if [ -d $$dir ] ; then \
+                       (cd $$dir && $(MAKE)) || exit 1 ; \
+               fi \
        done
 
+pcedit = sed \
+       -e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \
+       -e 's,@INSTALL_LIB_DIR@,$(INSTALL_LIB_DIR),' \
+       -e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \
+       -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \
+       -e 's,@DRI_DRIVER_DIR@,$(DRI_DRIVER_SEARCH_DIR),'
 
-install:
+dri.pc: dri.pc.in
+       $(pcedit) $< > $@
+
+
+install: dri.pc
        @for dir in $(DRI_DIRS) ; do \
-               (cd $$dir && $(MAKE) install) || exit 1; \
+               if [ -d $$dir ] ; then \
+                       (cd $$dir && $(MAKE) install) || exit 1 ; \
+               fi \
        done
+       $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
+       $(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \
+         $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
+       $(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_sarea.h \
+         $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
+       $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+       $(INSTALL) -m 0644 dri.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
 
 
 clean:
-       @for dir in $(DRI_DIRS) ; do \
-               (cd $$dir && $(MAKE) clean) ; \
+       -@for dir in $(DRI_DIRS) ; do \
+               if [ -d $$dir ] ; then \
+                       (cd $$dir && $(MAKE) clean) ; \
+               fi \
        done
        -rm -f common/*.o
+       -rm -f *.pc