From fe23dc5ecae87de73f7b5a581868065a4c4ac09b Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg <krh@redhat.com>
Date: Mon, 10 Mar 2008 18:43:53 -0400
Subject: Move make install logic for libGL back into src/mesa/Makefile.

This makes make install work again for non-glx libGL implementations.
The make install logic is split into three sub-targets: install-libgl,
install-osmesa, install-drivers.  The install target in src/glx/x11
is then implemented using the src/mesa make install-libgl rule.

Thanks to Dan Nicholson for pointing out the breakage.
---
 src/mesa/Makefile | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'src/mesa/Makefile')

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 87c5e6126d..695a416094 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -150,20 +150,40 @@ subdirs:
 		(cd x86-64 ; $(MAKE)) ; \
 	fi
 
+pcedit = sed \
+	-e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \
+	-e 's,@LIB_DIR@,$(LIB_DIR),' \
+	-e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),'
 
-install: default
+gl.pc: gl.pc.in
+	$(pcedit) $< > $@
+
+install-libgl: gl.pc
 	$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL
 	$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
+	$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig
 	$(INSTALL) -m 644 $(TOP)/include/GL/*.h $(DESTDIR)$(INSTALL_DIR)/include/GL
+	@if [ -e $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) ]; then \
+		$(INSTALL) $(TOP)/$(LIB_DIR)/libGL* \
+			$(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR); \
+	fi
+	$(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig
+
+install-osmesa:
 	@if [ -e $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) ]; then \
-		$(INSTALL) $(TOP)/$(LIB_DIR)/libOSMesa* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR); \
+		$(INSTALL) $(TOP)/$(LIB_DIR)/libOSMesa* \
+			$(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR); \
 	fi
+
+install-drivers:
 	@for target in $(DRIVER_DIRS); do \
 	  case "$$target" in \
 	    dri) cd drivers/dri ; $(MAKE) install ;; \
 	  esac; \
 	done
 
+install: default install-libgl install-osmesa install-drivers
+
 ## NOT INSTALLED YET:
 ## $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GLES
 ## $(INSTALL) -m 644 include/GLES/*.h $(DESTDIR)$(INSTALL_DIR)/include/GLES
-- 
cgit v1.2.3