diff options
| author | Eric Anholt <[email protected]> | 2012-05-24 16:16:28 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2012-05-29 12:39:30 -0700 |
| commit | 26eaee32455355c5376796140e0e3eb49e1c5865 (patch) | |
| tree | 9d5e19fb8a2a286ce11711cf71dcdcc5304eaf3f /src | |
| parent | 0ce0f7c0c8fa9902678af7f3ecad2541be5808d2 (diff) | |
mesa: Restore installing of libGL for non-dri builds.
Reported-by: Sven Joachim <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/Makefile | 10 |
1 files 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 |