From 26eaee32455355c5376796140e0e3eb49e1c5865 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 24 May 2012 16:16:28 -0700 Subject: [PATCH] mesa: Restore installing of libGL for non-dri builds. Reported-by: Sven Joachim Reviewed-by: Matt Turner Reviewed-by: Kenneth Graunke --- src/mesa/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/mesa/Makefile b/src/mesa/Makefile index 71e22b9cb10..bb7b13afdfb 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 -- 2.30.2