[gnome-settings-daemon] Fix include directory to match API version

[Bastien Nocera <hadess src gnome org>]

commit 6f6fe4a4fd9e12b8badd618ef0822ea0ad84a161
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Sep 22 14:32:49 2010 +0100

    Fix include directory to match API version

 configure.ac                      |    2 ++
 data/gnome-settings-daemon.pc.in  |    4 ++--
 gnome-settings-daemon/Makefile.am |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5296863..a0249da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,6 +3,8 @@ AC_PREREQ([2.60])
 m4_define([gsd_api_version_major],[3])
 m4_define([gsd_api_version_minor],[0])
 m4_define([gsd_api_version],[gsd_api_version_major.gsd_api_version_minor])
+GSD_API_VERSION="gsd_api_version"
+AC_SUBST(GSD_API_VERSION)
 
 AC_INIT([gnome-settings-daemon],
         [2.90.1],
diff --git a/data/gnome-settings-daemon.pc.in b/data/gnome-settings-daemon.pc.in
index 8a02c4d..c9907b3 100644
--- a/data/gnome-settings-daemon.pc.in
+++ b/data/gnome-settings-daemon.pc.in
@@ -3,11 +3,11 @@ exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
 libexecdir= libexecdir@
-plugindir=${libdir}/gnome-settings-daemon-2.0
+plugindir=${libdir}/gnome-settings-daemon- gsd_api_version@
 
 Name: gnome-settings-daemon
 Description: Utility library for accessing gnome-settings-daemon over DBUS
 Requires: glib-2.0 dbus-1 dbus-glib-1
 Version: @VERSION@
 Libs: -L${libdir}
-Cflags: -I${includedir}/gnome-settings-daemon-2.0
+Cflags: -I${includedir}/gnome-settings-daemon- gsd_api_version@
diff --git a/gnome-settings-daemon/Makefile.am b/gnome-settings-daemon/Makefile.am
index c889809..3aeee66 100644
--- a/gnome-settings-daemon/Makefile.am
+++ b/gnome-settings-daemon/Makefile.am
@@ -50,7 +50,7 @@ BUILT_SOURCES = 			\
 	gnome-settings-client.h		\
 	$(NULL)
 
-apidir   = $(includedir)/gnome-settings-daemon-2.0/gnome-settings-daemon
+apidir   = $(includedir)/gnome-settings-daemon-$(GSD_API_VERSION)/gnome-settings-daemon
 api_DATA = 				\
 	gnome-settings-client.h		\
 	gnome-settings-plugin.h