[gnome-pilot] Fix for #647479, #657658, #657365. 2011-09-10 Matt Davey <mcdavey mrao cam ac uk> * gnome-pi

[Matthew Charles Davey <mcdavey src gnome org>]

commit 3a2f7f7f231991cf5299b1960b4088067417c15d
Author: Matt Davey <mcdavey mrao cam ac uk>
Date:   Sat Sep 10 22:17:55 2011 +0100

    Fix for #647479, #657658, #657365.
    2011-09-10  Matt Davey <mcdavey mrao cam ac uk>
           * gnome-pilot-3.0.pc.in: Fix for #647479. Thanks to Tamas Nemeth
           * conduits/evolution-data-server/e-calendar.conduit.in: fix typo #657658.
                  Thanks Matt McCutchen.
           * conduits/backup/Makefile.am: fix missing include path #657365
           * conduits/test/Makefile.am: ditto.  Thanks Matt McCutchen.

 ChangeLog                                          |    7 +++++++
 conduits/backup/Makefile.am                        |    1 +
 .../evolution-data-server/e-calendar.conduit.in    |    2 +-
 conduits/test/Makefile.am                          |    7 ++++---
 gnome-pilot-3.0.pc.in                              |    2 +-
 5 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d1d4c88..4d80c72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-09-10  Matt Davey <mcdavey mrao cam ac uk>
+       * gnome-pilot-3.0.pc.in: Fix for #647479. Thanks to Tamas Nemeth
+       * conduits/evolution-data-server/e-calendar.conduit.in: fix typo #657658.
+              Thanks Matt McCutchen.
+       * conduits/backup/Makefile.am: fix missing include path #657365
+       * conduits/test/Makefile.am: ditto.  Thanks Matt McCutchen.
+
 2011-03-20  Matt Davey <mcdavey mrao cam ac uk>
        * configure.ac: post-release bump version to 2.91.93
 
diff --git a/conduits/backup/Makefile.am b/conduits/backup/Makefile.am
index b2a436f..d95d293 100644
--- a/conduits/backup/Makefile.am
+++ b/conduits/backup/Makefile.am
@@ -1,6 +1,7 @@
 AM_CPPFLAGS = 					\
 	-I$(top_srcdir)/ 			\
 	-I$(top_srcdir)/gpilotd			\
+	-I$(top_builddir)/gpilotd		\
 	$(GNOME_PILOT_CFLAGS) 			\
 	-DG_LOG_DOMAIN=\"backupconduit\"
 
diff --git a/conduits/evolution-data-server/e-calendar.conduit.in b/conduits/evolution-data-server/e-calendar.conduit.in
index 52c26a8..a01e6ba 100644
--- a/conduits/evolution-data-server/e-calendar.conduit.in
+++ b/conduits/evolution-data-server/e-calendar.conduit.in
@@ -1,5 +1,5 @@
 <gnome-pilot-conduit version="1.0">
-	<conduit id="e_calendar_conduit" type="shlib" location="@LIBDIR@/gnome-pilot/conduits/libecalendar_conduito-3.0.so"/>
+	<conduit id="e_calendar_conduit" type="shlib" location="@LIBDIR@/gnome-pilot/conduits/libecalendar_conduit-3.0.so"/>
 	<name value="ECalendar"/>
 	<conduit-attribute name="description" value="Synchronizes Calendar with Evolution-Data-Server"/>
 	<conduit-attribute name="default-synctype" value="synchronize"/>
diff --git a/conduits/test/Makefile.am b/conduits/test/Makefile.am
index 173f08a..9859eb3 100644
--- a/conduits/test/Makefile.am
+++ b/conduits/test/Makefile.am
@@ -1,6 +1,7 @@
-AM_CPPFLAGS = 			\
-	-I$(top_srcdir)		\
-	-I$(top_srcdir)/gpilotd	\
+AM_CPPFLAGS = 				\
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/gpilotd		\
+	-I$(top_builddir)/gpilotd	\
 	$(GNOME_PILOT_CFLAGS)
 
 test_conduitsdir=$(libdir)/gnome-pilot/conduits
diff --git a/gnome-pilot-3.0.pc.in b/gnome-pilot-3.0.pc.in
index 242296e..015f157 100644
--- a/gnome-pilot-3.0.pc.in
+++ b/gnome-pilot-3.0.pc.in
@@ -9,5 +9,5 @@ Name: Gnome Pilot
 Description: 
 Version: @VERSION@
 Requires: gtk+-3.0 >= 2.90.4 libedataserver-1.2 libebook-1.2
-Libs: -L${libdir} -lgpilotd -lgpilotdcm -lgpilotdconduit @PISOCK_LIBS@
+Libs: -L${libdir} -lgpilotd- BASE_VERSION@ -lgpilotdcm- BASE_VERSION@ -lgpilotdconduit- BASE_VERSION@ @PISOCK_LIBS@
 Cflags: -I${privincludedir} @PISOCK_CFLAGS@