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/glx/x11/Makefile | 17 ++---------------
 src/glx/x11/gl.pc.in | 11 -----------
 2 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 src/glx/x11/gl.pc.in

(limited to 'src/glx/x11')

diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index 1cef21cdae4..8fa3700a04c 100644
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -80,21 +80,8 @@ depend: $(SOURCES) $(MESA_GLAPI_SOURCES) $(MESA_ASM_API) Makefile
 tags:
 	etags `find . -name \*.[ch]` `find $(TOP)/include`
 
-pcedit = sed \
-	-e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \
-	-e 's,@LIB_DIR@,$(LIB_DIR),' \
-	-e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),'
-
-gl.pc: gl.pc.in
-	$(pcedit) $< > $@
-
-install: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) 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
-	$(INSTALL) $(TOP)/$(LIB_DIR)/libGL* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR); \
-	$(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig
+install: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
+	make -C $(TOP)/src/mesa install-libgl
 
 # Remove .o and backup files
 clean:
diff --git a/src/glx/x11/gl.pc.in b/src/glx/x11/gl.pc.in
deleted file mode 100644
index 4b144ffa4b2..00000000000
--- a/src/glx/x11/gl.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@INSTALL_DIR@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/@LIB_DIR@
-includedir=${prefix}/include
-
-Name: gl
-Description: Mesa OpenGL library
-Requires:
-Version: @VERSION@
-Libs: -L${libdir} -lGL
-Cflags: -I${includedir}
-- 
cgit v1.2.3