Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/ChangeLog,v
retrieving revision 1.391
diff -u -r1.391 ChangeLog
--- ChangeLog	15 May 2006 14:16:06 -0000	1.391
+++ ChangeLog	17 May 2006 07:57:18 -0000
@@ -1,3 +1,9 @@
+2006-05-17  Boby Wang <boby.wang@sun.com>
+
+	** Fix For #341802
+	* configure.in:
+	To cope with the coexistence of multiple evolution-data-server's version.
+
 2006-05-15  Harish Krishnaswamy  <kharish@novell.com>
 
 	* configure.in: Append -DLDAP_DEPRECATED to LDAP_CFLAGS and
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution-data-server/configure.in,v
retrieving revision 1.173
diff -u -r1.173 configure.in
--- configure.in	15 May 2006 14:16:06 -0000	1.173
+++ configure.in	17 May 2006 07:57:19 -0000
@@ -1298,13 +1322,13 @@
 dnl --- need to add it to one or more .pc.in files (for Connector,
 dnl --- etc)
 
-privdatadir='${datadir}'/evolution-data-server-$BASE_VERSION
+privdatadir='${datadir}'/evolution-data-server/$BASE_VERSION
 AC_SUBST(privdatadir)
 
 privincludedir='${includedir}'/evolution-data-server-$BASE_VERSION
 AC_SUBST(privincludedir)
 
-privlibdir='${libdir}'/evolution-data-server-$BASE_VERSION
+privlibdir='${libdir}'/evolution-data-server/$BASE_VERSION
 AC_SUBST(privlibdir)
 
 idldir="$datadir/idl/evolution-data-server-$API_VERSION"
@@ -1316,7 +1340,7 @@
 serverdir="$libdir/bonobo/servers"
 AC_SUBST(serverdir)
 
-extensiondir='${libdir}'/evolution-data-server-$API_VERSION/extensions
+extensiondir='${libdir}'/evolution-data-server/$API_VERSION/extensions
 AC_SUBST(extensiondir)
 
 gladedir="$privdatadir/glade"
@@ -1326,7 +1350,7 @@
 AC_SUBST(weatherdatadir)
 
 dnl separate camel from e-d-s?  or should it be under the same spot?  same for now.
-camel_providerdir='${libdir}'/evolution-data-server-$API_VERSION/camel-providers
+camel_providerdir='${libdir}'/evolution-data-server/$API_VERSION/camel-providers
 AC_SUBST(camel_providerdir)
 
 dnl ************************
