[Mesa-dev] [PATCH 13/19] automake: Convert osmesa.pc to be generated by configure.

[Eric Anholt]

---
 configure.ac          |    1 +
 src/mesa/Makefile     |   18 +-----------------
 src/mesa/osmesa.pc.in |    8 ++++----
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/configure.ac b/configure.ac
index 81e0933..6135302 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2184,6 +2184,7 @@ AC_CONFIG_FILES([configs/current
 		src/mesa/drivers/dri/swrast/Makefile
 		src/mesa/drivers/x11/Makefile
 		src/mesa/gl.pc
+		src/mesa/osmesa.pc
 		tests/Makefile
 		tests/glx/Makefile])
 
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 7799676..6a6be27 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -161,21 +161,6 @@ install: default $(DRICORE_INSTALL_TARGET)
 	  esac ; \
 	done
 
-pcedit = \
-	-e 's, at INSTALL_DIR@,$(INSTALL_DIR),' \
-	-e 's, at INSTALL_LIB_DIR@,$(INSTALL_LIB_DIR),' \
-	-e 's, at INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \
-	-e 's, at VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \
-
-osmesa_pcedit = sed \
-	$(pcedit) \
-	-e 's, at OSMESA_LIB@,$(OSMESA_LIB),' \
-	-e 's, at OSMESA_PC_REQ@,$(OSMESA_PC_REQ),' \
-	-e 's, at OSMESA_PC_LIB_PRIV@,$(OSMESA_PC_LIB_PRIV),'
-
-osmesa.pc: osmesa.pc.in
-	$(osmesa_pcedit) $< > $@
-
 install-headers:
 	$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL
 	$(INSTALL) -m 644 $(TOP)/include/GL/*.h \
@@ -186,7 +171,7 @@ install-libgl-pc: install-headers
 	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
 	$(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
 
-install-osmesa: default osmesa.pc
+install-osmesa: default
 	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
 	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
 	$(MINSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \
@@ -208,7 +193,6 @@ clean:
 	-rm -f */*/*.o
 	-rm -f depend depend.bak libmesa.a libmesagallium.a
 	-rm -f drivers/*/*.o
-	-rm -f osmesa.pc
 	-rm -f $(BUILT_SOURCES)
 	- at cd drivers/dri && $(MAKE) clean
 	- at cd drivers/x11 && $(MAKE) clean
diff --git a/src/mesa/osmesa.pc.in b/src/mesa/osmesa.pc.in
index 05327f4..307255f 100644
--- a/src/mesa/osmesa.pc.in
+++ b/src/mesa/osmesa.pc.in
@@ -1,12 +1,12 @@
-prefix=@INSTALL_DIR@
+prefix=@prefix@
 exec_prefix=${prefix}
-libdir=@INSTALL_LIB_DIR@
-includedir=@INSTALL_INC_DIR@
+libdir=@libdir@
+includedir=@includedir@
 
 Name: osmesa
 Description: Mesa Off-screen Rendering library
 Requires: @OSMESA_PC_REQ@
-Version: @VERSION@
+Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -l at OSMESA_LIB@
 Libs.private: @OSMESA_PC_LIB_PRIV@
 Cflags: -I${includedir}
-- 
1.7.10