From 8f8f18fba0ae94c500393885f3bb678322f5b019 Mon Sep 17 00:00:00 2001
From: JP Rosevear <jpr@ximian.com>
Date: Mon, 1 Dec 2003 19:46:12 +0000
Subject: define privconduitdir

2003-12-01  JP Rosevear <jpr@ximian.com>

	* configure.in: define privconduitdir

svn path=/trunk/; revision=23536
---
 ChangeLog                                        |  4 ++++
 calendar/ChangeLog                               | 10 ++++++++++
 calendar/conduits/calendar/Makefile.am           |  4 ++--
 calendar/conduits/calendar/e-calendar.conduit.in |  2 +-
 calendar/conduits/todo/Makefile.am               |  4 ++--
 calendar/conduits/todo/e-todo.conduit.in         |  2 +-
 configure.in                                     |  3 +++
 7 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 40d81b83f8..65da9fb8d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-12-01  JP Rosevear <jpr@ximian.com>
+
+	* configure.in: define privconduitdir
+
 2003-11-28  Anders Carlsson  <andersca@gnome.org>
 
 	* configure.in: Look for mozilla-nss.pc, not mozilla.pc.
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index bfbc0745d5..e53ae085b9 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,13 @@
+2003-12-01  JP Rosevear <jpr@ximian.com>
+
+	* conduits/todo/Makefile.am: put the conduits in their own dir
+
+	* conduits/calendar/Makefile.am: ditto
+	
+	* conduits/todo/e-todo.conduit.in: subst in correct thing
+
+	* conduits/calendar/e-calendar.conduit.in: ditto
+
 2003-12-01  JP Rosevear <jpr@ximian.com>
 
 	* conduits/todo/Makefile.am: install to privlibdir
diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am
index 12b1ae325d..7bf53a7aed 100644
--- a/calendar/conduits/calendar/Makefile.am
+++ b/calendar/conduits/calendar/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = 					\
 	$(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)
 
 # Calendar Conduit
-privlib_LTLIBRARIES = libecalendar_conduit.la
+privconduit_LTLIBRARIES = libecalendar_conduit.la
 
 libecalendar_conduit_la_SOURCES = 	\
 	calendar-conduit.c
@@ -16,7 +16,7 @@ libecalendar_conduit_la_LIBADD = 					\
 	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
 
 e-calendar-$(BASE_VERSION).conduit: e-calendar.conduit.in
-	sed -e 's^\@privlibdir\@^$(privlibdir)^g' 				\
+	sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' 				\
 	    -e 's^\@datadir\@^$(datadir)^g' 				\
 	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
 	    $< > $@
diff --git a/calendar/conduits/calendar/e-calendar.conduit.in b/calendar/conduits/calendar/e-calendar.conduit.in
index 9370bf487e..6ddcf5761a 100644
--- a/calendar/conduits/calendar/e-calendar.conduit.in
+++ b/calendar/conduits/calendar/e-calendar.conduit.in
@@ -1,5 +1,5 @@
 <gnome-pilot-conduit version="1.0">
-	<conduit id="e_calendar_conduit" type="shlib" location="@privlibdir@/libecalendar_conduit.so"/>
+	<conduit id="e_calendar_conduit" type="shlib" location="@privconduitdir@/libecalendar_conduit.so"/>
 	<name value="ECalendar"/>
 	<conduit-attribute name="description" value="Synchronizes Calendar with Evolution @BASE_VERSION@"/>
 	<conduit-attribute name="default-synctype" value="synchronize"/>
diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am
index 5a3a721772..15e7a81f84 100644
--- a/calendar/conduits/todo/Makefile.am
+++ b/calendar/conduits/todo/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = 					\
 	$(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)
 
 # ToDo Conduit
-privlib_LTLIBRARIES = libetodo_conduit.la
+privconduit_LTLIBRARIES = libetodo_conduit.la
 
 libetodo_conduit_la_SOURCES = 	\
 	todo-conduit.c
@@ -16,7 +16,7 @@ libetodo_conduit_la_LIBADD = 						\
 	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
 
 e-todo-$(BASE_VERSION).conduit: e-todo.conduit.in
-	sed -e 's^\@privlibdir\@^$(privlibdir)^g' 			\
+	sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' 			\
 	    -e 's^\@datadir\@^$(datadir)^g' 				\
 	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
 	    $< > $@
diff --git a/calendar/conduits/todo/e-todo.conduit.in b/calendar/conduits/todo/e-todo.conduit.in
index 2ff0288edf..3b02058c91 100644
--- a/calendar/conduits/todo/e-todo.conduit.in
+++ b/calendar/conduits/todo/e-todo.conduit.in
@@ -1,5 +1,5 @@
 <gnome-pilot-conduit version="1.0">
-	<conduit id="e_todo_conduit" type="shlib" location="@privlibdir@/libetodo_conduit.so"/>
+	<conduit id="e_todo_conduit" type="shlib" location="@privconduitdir@/libetodo_conduit.so"/>
 	<name value="EToDo"/>
 	<conduit-attribute name="description" value="Synchronizes ToDo List with Evolution @BASE_VERSION@"/>
 	<conduit-attribute name="default-synctype" value="synchronize"/>
diff --git a/configure.in b/configure.in
index fa8605bfbe..310928c558 100644
--- a/configure.in
+++ b/configure.in
@@ -1149,6 +1149,9 @@ AC_SUBST(etspecdir)
 viewsdir="$privdatadir/views"
 AC_SUBST(viewsdir)
 
+privconduitdir='${libdir}'/evolution/$BASE_VERSION/conduits
+AC_SUBST(privconduitdir)
+
 dnl ************************
 dnl IDL/Component Versioning
 dnl ************************
-- 
cgit