aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/conduits/common/Makefile.am1
-rw-r--r--calendar/conduits/common/libecalendar-common-conduit.c2
3 files changed, 10 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 4c018639e0..e076ec7f43 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-17 Matt Davey <mcdavey@mrao.cam.ac.uk>
+
+ ** Fix for bug #556059
+
+ * conduits/common/Makefile.am:
+ * conduits/common/libecalendar-common-conduit.c: Allow building outside
+ the source tree.
+
2008-10-17 Milan Crha <mcrha@redhat.com>
** Fix for bug #553609
diff --git a/calendar/conduits/common/Makefile.am b/calendar/conduits/common/Makefile.am
index 3f18ffa19c..2db1df5fca 100644
--- a/calendar/conduits/common/Makefile.am
+++ b/calendar/conduits/common/Makefile.am
@@ -1,4 +1,5 @@
INCLUDES = \
+ -I$(top_srcdir) \
-I$(top_srcdir)/e-util \
-I$(top_builddir)/e-util \
$(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)
diff --git a/calendar/conduits/common/libecalendar-common-conduit.c b/calendar/conduits/common/libecalendar-common-conduit.c
index c5000875b7..1b7013bb0a 100644
--- a/calendar/conduits/common/libecalendar-common-conduit.c
+++ b/calendar/conduits/common/libecalendar-common-conduit.c
@@ -26,7 +26,7 @@
#include <string.h>
#include <libedataserver/e-categories.h>
-#include <e-util/e-pilot-util.h>
+#include <e-pilot-util.h>
#include <pi-appinfo.h>
#include <glib.h>