Module: Mesa
Branch: master
Commit: 26eaee32455355c5376796140e0e3eb49e1c5865
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=26eaee32455355c5376796140e0e3eb49e1c5865
Author: Eric Anholt <e...@anholt.net>
Date: Thu May 24 16:16:28 2012 -0700
mesa: Restore installing of libGL for non-dri builds.
Reported-by: Sven Joachim <svenj...@gmx.de>
Reviewed-by: Matt Turner <matts...@gmail.com>
Reviewed-by: Kenneth Graunke <kenn...@whitecape.org>
---
src/mesa/Makefile | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 71e22b9..bb7b13a 100644
--- 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
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
