automake: Convert osmesa.pc to be generated by configure.

diff --git a/configure.ac b/configure.ac
index a5df38a13fd0f38d43b311ea4029b1b72134389e..e41a73d5e5310fc68784c49ecd93488711ba99cb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2186,7 +2186,8 @@ AC_CONFIG_FILES([configs/current
                src/mesa/drivers/dri/radeon/Makefile
                src/mesa/drivers/dri/swrast/Makefile
                src/mesa/drivers/x11/Makefile
-               src/mesa/gl.pc])
+               src/mesa/gl.pc
+               src/mesa/osmesa.pc])
 
 dnl Sort the dirs alphabetically
 GALLIUM_TARGET_DIRS=`echo $GALLIUM_TARGET_DIRS|tr " " "\n"|sort -u|tr "\n" " "`

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 77996768cd5e3dde2fea4ac0b7c8b7b7b5c24e93..6a6be276fd08597a4048abfd31b473f9d35bbe49 100644 (file)
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -161,21 +161,6 @@ install: default $(DRICORE_INSTALL_TARGET)
          esac ; \
        done
 
-pcedit = \
-       -e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \
-       -e 's,@INSTALL_LIB_DIR@,$(INSTALL_LIB_DIR),' \
-       -e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \
-       -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \
-
-osmesa_pcedit = sed \
-       $(pcedit) \
-       -e 's,@OSMESA_LIB@,$(OSMESA_LIB),' \
-       -e 's,@OSMESA_PC_REQ@,$(OSMESA_PC_REQ),' \
-       -e 's,@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)
        -@cd drivers/dri && $(MAKE) clean
        -@cd drivers/x11 && $(MAKE) clean

diff --git a/src/mesa/osmesa.pc.in b/src/mesa/osmesa.pc.in
index 05327f40aa084dc41e5a892db1360ba120e32eb3..307255ffc99976041e7565347a7c12f6e2714dbe 100644 (file)
--- 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@OSMESA_LIB@
 Libs.private: @OSMESA_PC_LIB_PRIV@
 Cflags: -I${includedir}