mesa: Restore installing of libGL for non-dri builds.

Reported-by: Sven Joachim <svenjoac@gmx.de>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 71e22b9cb108bcc860744a69cae8d25a4ba65940..bb7b13afdfbf3486207b31abbd2f0f146a4fb7ce 100644 (file)
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -166,8 +166,8 @@ install: default $(DRICORE_INSTALL_TARGET)
                    else \
                      $(MAKE) install-osmesa || exit 1 ; \
                    fi ;; \
-           dri)    $(MAKE) install-libgl install-dri || exit 1 ;; \
-           *)      $(MAKE) install-libgl || exit 1 ;; \
+           dri)    $(MAKE) install-libgl-pc install-dri || exit 1 ;; \
+           *)      $(MAKE) install-libgl-pc install-libgl || exit 1 ;; \
          esac ; \
        done
 
@@ -203,7 +203,11 @@ install-headers:
        $(INSTALL) -m 644 $(TOP)/include/GL/*.h \
                $(DESTDIR)$(INSTALL_INC_DIR)/GL
 
-install-libgl: default gl.pc install-headers
+install-libgl: default
+       $(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \
+       $(DESTDIR)$(INSTALL_LIB_DIR)
+
+install-libgl-pc: gl.pc install-headers
        $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
        $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
        $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig