[geocode-glib] Make include directory API versioned

[Andreas Henriksson <ah src gnome org>]

commit f6d9112bd553b030ef8cd71dc28ebf6f2b7c04ce
Author: Andreas Henriksson <andreas fatal se>
Date:   Thu Jul 4 14:53:56 2013 +0200

    Make include directory API versioned
    
    Note that this will break users of geocode-glib which did not
    use the geocode-glib/ subdirectory prefix in the include path
    (like geoclue2), according to how the pkg-config file was layed
    out before.
    
    Remaining cleanup is to unify the internal include paths inside
    geocode-glib to be either "..." or <geocode-glib/...>.
    
    While forcing geocode-glib uses to update their include paths
    and internally cleaning up the include paths, this might also
    be a good time to drop the filename prefix on header files
    since both subdirectory and filename prefix in include paths
    seems redundant.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=703571

 configure.ac             |    3 +++
 geocode-glib-1.0.pc.in   |    4 +++-
 geocode-glib/Makefile.am |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index dbfcb57..c8c57a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,9 @@ AM_INIT_AUTOMAKE([1.11 dist-xz no-dist-gzip check-news])
 GCLIB_LT_VERSION=0:0:0
 AC_SUBST(GCLIB_LT_VERSION)
 
+GCLIB_API_VERSION=1.0
+AC_SUBST(GCLIB_API_VERSION)
+
 AM_MAINTAINER_MODE([enable])
 
 # Support silent build rules, requires at least automake-1.11. Disable
diff --git a/geocode-glib-1.0.pc.in b/geocode-glib-1.0.pc.in
index fd39a88..4c6b37b 100644
--- a/geocode-glib-1.0.pc.in
+++ b/geocode-glib-1.0.pc.in
@@ -3,9 +3,11 @@ exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
 
+apiversion= GCLIB_API_VERSION@
+
 Name: geocode-glib
 Description: Helper library for the Yahoo! Place Finder service
 Version: @VERSION@
 Requires: gio-2.0
 Libs: -L${libdir} -lgeocode-glib
-Cflags: -I${includedir}/geocode-glib
+Cflags: -I${includedir}/geocode-glib-${apiversion}
diff --git a/geocode-glib/Makefile.am b/geocode-glib/Makefile.am
index dbcfbcc..3c9f85b 100644
--- a/geocode-glib/Makefile.am
+++ b/geocode-glib/Makefile.am
@@ -39,7 +39,7 @@ GCGLIB_HEADER_FILES = \
        geocode-ipclient.h                              \
        geocode-place.h
 
-gcglibdir = $(pkgincludedir)
+gcglibdir = $(includedir)/$(PACKAGE)-$(GCLIB_API_VERSION)/$(PACKAGE)
 gcglib_HEADERS =                                       \
        $(GCGLIB_HEADER_FILES)                          \
        geocode-enum-types.h