summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2012-07-15 10:31:01 -0400
committerRyan Lortie <desrt@desrt.ca>2012-07-15 10:32:58 -0400
commitcdcf70a0d86d019e34d3ea755f6de6634807b58f (patch)
tree095e838ffcd89240ff0dc8a2ac21cb43ac57f996 /common
parent32985d9a8325062c94d086b38c09203b0dc5f3e3 (diff)
downloaddconf-cdcf70a0d86d019e34d3ea755f6de6634807b58f.tar.gz
tweak public header installation
Colin noticed that this was totally broken (from an ostree build). Fix it up.
Diffstat (limited to 'common')
-rw-r--r--common/Makefile.am5
-rw-r--r--common/dconf-paths.h6
2 files changed, 6 insertions, 5 deletions
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__ */