[glom] Make pc.in file unversioned

[David King <davidk src gnome org>]

commit aeb87b38c82c7e573111a5af10382d98f42f358e
Author: David King <davidk openismus com>
Date:   Fri Sep 10 14:35:27 2010 +0200

    Make pc.in file unversioned
    
    * configure.ac: Additionally specify source file for unversioned
    glom.pc.in.
    * glom/libglom/glom-1.16.pc.in: Move to unversioned
    glom/libglom/glom.pc.in, which will be moved to a versioned file by
    configure.

 ChangeLog                                    |   10 ++++++++++
 configure.ac                                 |    2 +-
 glom/libglom/{glom-1.16.pc.in => glom.pc.in} |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3cde50b..793ccfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2010-09-10  David King  <davidk openismus com>
 
+	Make pc.in file unversioned
+
+	* configure.ac: Additionally specify source file for unversioned
+	glom.pc.in.
+	* glom/libglom/glom-1.16.pc.in: Move to unversioned
+	glom/libglom/glom.pc.in, which will be moved to a versioned file by
+	configure.
+
+2010-09-10  David King  <davidk openismus com>
+
 	Use GLOM_ABI_VERSION in Makefiles and configure.ac
 
 	* Makefile.am:
diff --git a/configure.ac b/configure.ac
index 0c8840b..20ec03b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -280,7 +280,7 @@ AC_CONFIG_FILES([Makefile
                  docs/user-guide/Makefile
                  po/Makefile.in
                  glom.desktop.in
-                 glom/libglom/glom-$(GLOM_ABI_VERSION).pc
+                 glom/libglom/glom-${GLOM_ABI_VERSION}.pc:glom/libglom/glom.pc.in
                  docs/libglom_reference/Makefile
                  docs/libglom_reference/Doxyfile
                  docs/pyglom_reference/Makefile
diff --git a/glom/libglom/glom-1.16.pc.in b/glom/libglom/glom.pc.in
similarity index 92%
rename from glom/libglom/glom-1.16.pc.in
rename to glom/libglom/glom.pc.in
index 93b68dd..a0a66a0 100644
--- a/glom/libglom/glom-1.16.pc.in
+++ b/glom/libglom/glom.pc.in
@@ -6,6 +6,6 @@ includedir= includedir@
 Name: libglom
 Description: Library for accessing Glom documents and data structures.
 Requires: glibmm-2.4 giomm-2.4 libgdamm-4.0 libxml++-2.6
-Version: @VERSION@
+Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lglom- GLOM_ABI_VERSION@
 Cflags: -I${includedir}/glom- GLOM_ABI_VERSION@