Make everything buildable out-of-tree.

diff --git a/src/Makefile.am b/src/Makefile.am
index cde347848e81fea8e8fbf1157c2b942a572d0ea7..53872e79a6a4b95d26959badc253d79c82be8cf9 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = liboconfig
 # coverage related flags are only set when gcov is enabled
 AM_CFLAGS = @STRICT_CFLAGS@ @COVERAGE_CFLAGS@
 AM_LDFLAGS = @COVERAGE_LDFLAGS@
-AM_CPPFLAGS  = -Iinclude
+AM_CPPFLAGS  = -I"${top_srcdir}/src/include"
 AM_CPPFLAGS += -DSYSCONFDIR='"${sysconfdir}"'
 AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"'
 AM_CPPFLAGS += -DPKGLIBDIR='"${pkglibdir}"'

diff --git a/src/liboconfig/utils.c b/src/liboconfig/utils.c
index c713610876b6b5e43ff0c88e00ac46d6bfba6967..1b787ad333ddf00b5fab10aab51f06458b52b5cc 100644 (file)
--- a/src/liboconfig/utils.c
+++ b/src/liboconfig/utils.c
@@ -19,7 +19,7 @@
 #ifndef OCONFIG_UTILS_H
 #define OCONFIG_UTILS_H 1
 
-#include "liboconfig/oconfig.h"
+#include "oconfig.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/liboconfig/utils.h b/src/liboconfig/utils.h
index 5a2ae85b094a46520a1d71aa5073c2147b5029c1..d66457ba615bff79932f8c89d0cabbefb5939143 100644 (file)
--- a/src/liboconfig/utils.h
+++ b/src/liboconfig/utils.h
@@ -19,7 +19,7 @@
 #ifndef OCONFIG_UTILS_H
 #define OCONFIG_UTILS_H 1
 
-#include "liboconfig/oconfig.h"
+#include "oconfig.h"
 
 #ifdef __cplusplus
 extern "C" {