Move libGL install target to the libGL Makefile.

diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index 3366f005eb55e495df6a6d0d1d74de8e5a4b5c35..1cef21cdae44d0121200ad33c98e4eaf675a3a4a 100644 (file)
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -80,8 +80,21 @@ depend: $(SOURCES) $(MESA_GLAPI_SOURCES) $(MESA_ASM_API) Makefile
 tags:
        etags `find . -name \*.[ch]` `find $(TOP)/include`
 
-# Dummy install target
-install:
+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
 
 # Remove .o and backup files
 clean:

diff --git a/src/glx/x11/gl.pc.in b/src/glx/x11/gl.pc.in
new file mode 100644 (file)
index 0000000..4b144ff
--- /dev/null
+++ b/src/glx/x11/gl.pc.in
@@ -0,0 +1,11 @@
+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}

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index d0c78b71eed6646561246601fc772da227f122e4..87c5e6126def2a44e4effac6717f6edfe7c642e5 100644 (file)
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -131,15 +131,6 @@ $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECT
        fi
 
 
-######################################################################
-# libGL pkg-config file
-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) $< > $@
-
 ######################################################################
 # Generic stuff
 
@@ -160,15 +151,10 @@ subdirs:
        fi
 
 
-install: default gl.pc
+install: default
        $(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
        @if [ -e $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) ]; then \
                $(INSTALL) $(TOP)/$(LIB_DIR)/libOSMesa* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR); \
        fi

diff --git a/src/mesa/gl.pc.in b/src/mesa/gl.pc.in
deleted file mode 100644 (file)
index 4b144ff..0000000
--- a/src/mesa/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}