[glom] Install libglom headers to the correct, ABI-specific directory.

[Murray Cumming <murrayc src gnome org>]

commit 9e4cb0e50ebf74f331fa13aad74592dff624428b
Author: David King <davidk openismus com>
Date:   Tue Jul 21 16:55:08 2009 +0200

    Install libglom headers to the correct, ABI-specific directory.
    
    * glom/libglom/glom-1.0.pc.in:
    * glom/libglom/*/Makefile.am: Use GLOM_ABI_VERSION in place of "1.0" so
    that installed headers go into the correct, ABI-specific directory.

 ChangeLog                                          |    6 ++++++
 glom/libglom/data_structure/Makefile.am            |    2 +-
 glom/libglom/data_structure/layout/Makefile.am     |    2 +-
 .../data_structure/layout/report_parts/Makefile.am |    2 +-
 glom/libglom/document/Makefile.am                  |    2 +-
 glom/libglom/document/bakery/Makefile.am           |    2 +-
 glom/libglom/document/bakery/view/Makefile.am      |    2 +-
 glom/libglom/glom-1.0.pc.in                        |    4 ++--
 8 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b974a2e..f8d6591 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-21  David King  <davidk openismus com>
+
+	* glom/libglom/glom-1.0.pc.in:
+	* glom/libglom/*/Makefile.am: Use GLOM_ABI_VERSION in place of "1.0" so
+	that installed headers go into the correct, ABI-specific directory.
+
 2009-07-21  Murray Cumming  <murrayc murrayc com>
 
 	* glom/libglom/glom-1.0.pc.in: Remove the bakery dependency, because no part 
diff --git a/glom/libglom/data_structure/Makefile.am b/glom/libglom/data_structure/Makefile.am
index 05db814..440a5d6 100644
--- a/glom/libglom/data_structure/Makefile.am
+++ b/glom/libglom/data_structure/Makefile.am
@@ -33,7 +33,7 @@ cc_sources = field.cc \
                               translatable_item.cc \
                               parameternamegenerator.cc
 
-library_includedir=$(includedir)/glom-1.0/libglom/data_structure
+library_includedir=$(includedir)/glom-$(GLOM_ABI_VERSION)/libglom/data_structure
 library_include_HEADERS = $(h_sources)
 
 noinst_LTLIBRARIES = libdata_structure.la
diff --git a/glom/libglom/data_structure/layout/Makefile.am b/glom/libglom/data_structure/layout/Makefile.am
index 3df88ec..9846bfc 100644
--- a/glom/libglom/data_structure/layout/Makefile.am
+++ b/glom/libglom/data_structure/layout/Makefile.am
@@ -35,7 +35,7 @@ cc_sources = layoutitem.cc \
                               custom_title.cc \
                               layoutitem_placeholder.cc
 
-library_includedir=$(includedir)/glom-1.0/libglom/data_structure/layout
+library_includedir=$(includedir)/glom-$(GLOM_ABI_VERSION)/libglom/data_structure/layout
 library_include_HEADERS = $(h_sources)
 
 libdata_structure_layout_la_SOURCES = $(h_sources) $(cc_sources)
diff --git a/glom/libglom/data_structure/layout/report_parts/Makefile.am b/glom/libglom/data_structure/layout/report_parts/Makefile.am
index e6c72ad..26e414d 100644
--- a/glom/libglom/data_structure/layout/report_parts/Makefile.am
+++ b/glom/libglom/data_structure/layout/report_parts/Makefile.am
@@ -16,7 +16,7 @@ cc_sources = layoutitem_groupby.cc \
                               layoutitem_footer.cc \
                               layoutitem_verticalgroup.cc
 
-library_includedir=$(includedir)/glom-1.0/libglom/data_structure/layout/report_parts
+library_includedir=$(includedir)/glom-$(GLOM_ABI_VERSION)/libglom/data_structure/layout/report_parts
 library_include_HEADERS = $(h_sources)
 
 libdata_structure_layout_reportparts_la_SOURCES = $(h_sources) $(cc_sources)
diff --git a/glom/libglom/document/Makefile.am b/glom/libglom/document/Makefile.am
index a1b4c1d..08c5d79 100644
--- a/glom/libglom/document/Makefile.am
+++ b/glom/libglom/document/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(LIBGLOM_CFLAGS) $(GLOM_WARNI
 h_sources = document.h view.h
 cc_sources = document.cc
 
-library_includedir=$(includedir)/glom-1.0/libglom/document
+library_includedir=$(includedir)/glom-$(GLOM_ABI_VERSION)/libglom/document
 library_include_HEADERS = $(h_sources)
 
 noinst_LTLIBRARIES = libdocument.la
diff --git a/glom/libglom/document/bakery/Makefile.am b/glom/libglom/document/bakery/Makefile.am
index f3caa91..dabcebd 100644
--- a/glom/libglom/document/bakery/Makefile.am
+++ b/glom/libglom/document/bakery/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(LIBGLOM_CFLAGS) $(GLOM_WARNI
 h_sources = document.h document_xml.h
 cc_sources = document.cc document_xml.cc
 
-library_includedir=$(includedir)/glom-1.0/libglom/document/bakery
+library_includedir=$(includedir)/glom-$(GLOM_ABI_VERSION)/libglom/document/bakery
 library_include_HEADERS = $(h_sources)
 
 noinst_LTLIBRARIES = libdocument_bakery.la
diff --git a/glom/libglom/document/bakery/view/Makefile.am b/glom/libglom/document/bakery/view/Makefile.am
index 9b64973..3d76369 100644
--- a/glom/libglom/document/bakery/view/Makefile.am
+++ b/glom/libglom/document/bakery/view/Makefile.am
@@ -11,7 +11,7 @@ AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(LIBGLOM_CFLAGS) $(GLOM_WARNI
 h_sources = view.h viewbase.h view_composite.h 
 cc_sources = view.cc viewbase.cc view_composite.cc 
 
-library_includedir=$(includedir)/glom-1.0/libglom/document/bakery/view
+library_includedir=$(includedir)/glom-$(GLOM_ABI_VERSION)/libglom/document/bakery/view
 library_include_HEADERS = $(h_sources)
 
 noinst_LTLIBRARIES = libdocument_bakery_view.la
diff --git a/glom/libglom/glom-1.0.pc.in b/glom/libglom/glom-1.0.pc.in
index aacb755..935cb9f 100644
--- a/glom/libglom/glom-1.0.pc.in
+++ b/glom/libglom/glom-1.0.pc.in
@@ -7,5 +7,5 @@ Name: libglom
 Description: Library for accessing Glom documents and data structures.
 Requires: glibmm-2.4 giomm-2.4 libgdamm-4.0
 Version: @VERSION@
-Libs: -L${libdir} -lglom-1.0
-Cflags: -I${includedir}/glom-1.0
+Libs: -L${libdir} -lglom- GLOM_ABI_VERSION@
+Cflags: -I${includedir}/glom- GLOM_ABI_VERSION@