[dconf] tweak public header installation

[Ryan Lortie <ryanl src gnome org>]

commit cdcf70a0d86d019e34d3ea755f6de6634807b58f
Author: Ryan Lortie <desrt desrt ca>
Date:   Sun Jul 15 10:31:01 2012 -0400

    tweak public header installation
    
    Colin noticed that this was totally broken (from an ostree build).  Fix
    it up.

 client/Makefile.am   |    6 +++---
 client/dconf.h       |    6 +++---
 common/Makefile.am   |    5 +++--
 common/dconf-paths.h |    6 +++---
 4 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/client/Makefile.am b/client/Makefile.am
index 368e11f..dfb910d 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -16,9 +16,9 @@ uninstall-hook:
 	rm -f $(DESTDIR)$(shlibdir)/libdconf.so.1
 	rm -f $(DESTDIR)$(shlibdir)/libdconf.so
 
-dconfinclude_HEADERS = \
-	dconf-client.h	\
-	dconf.h
+dconfinclude_HEADERS = dconf.h
+dconfclientinclude_HEADERS = dconf-client.h
+dconfclientincludedir = $(dconfincludedir)/client
 
 libdconf_client_a_CFLAGS = $(gio_CFLAGS)
 libdconf_client_a_SOURCES = \
diff --git a/client/dconf.h b/client/dconf.h
index 21b8f70..d946bd3 100644
--- a/client/dconf.h
+++ b/client/dconf.h
@@ -22,8 +22,8 @@
 #ifndef __dconf_h__
 #define __dconf_h__
 
-#include <dconf-paths.h>
-#include <dconf-changeset.h>
-#include <dconf-client.h>
+#include <common/dconf-paths.h>
+#include <common/dconf-changeset.h>
+#include <client/dconf-client.h>
 
 #endif /* __dconf_h__ */
diff --git a/common/Makefile.am b/common/Makefile.am
index 77903f1..bb24585 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,13 +1,14 @@
 include $(top_srcdir)/Makefile.gtester
 
-dconfinclude_HEADERS = \
+dconfcommonincludedir = $(dconfincludedir)/common
+dconfcommoninclude_HEADERS = \
+	dconf-changeset.h	\
 	dconf-paths.h
 
 noinst_LIBRARIES = libdconf-common.a libdconf-common-shared.a libdconf-common-hidden.a
 
 libdconf_common_a_CFLAGS = $(glib_CFLAGS)
 libdconf_common_a_SOURCES = \
-	dconf-changeset.h	\
 	dconf-changeset.c	\
 	dconf-paths.c
 
diff --git a/common/dconf-paths.h b/common/dconf-paths.h
index 48e2182..75e9add 100644
--- a/common/dconf-paths.h
+++ b/common/dconf-paths.h
@@ -20,8 +20,8 @@
  * Author: Ryan Lortie <desrt desrt ca>
  */
 
-#ifndef __dconf_common_h__
-#define __dconf_common_h__
+#ifndef __dconf_paths_h__
+#define __dconf_paths_h__
 
 #include <glib.h>
 
@@ -39,4 +39,4 @@ gboolean                dconf_is_rel_key                                (const g
 gboolean                dconf_is_rel_dir                                (const gchar         *string,
                                                                          GError             **error);
 
-#endif /* __dconf_common_h__ */
+#endif /* __dconf_paths_h__ */