Modify camelproviderdir to use API_VERSION. use VERSION instead of

2005-04-25  Harish Krishnaswamy  <kharish@novell.com>

* configure.in: Modify camelproviderdir to use API_VERSION.
* evolution-data-server.pc.in: use VERSION instead of
* API_VERSION.

diff --git a/ChangeLog b/ChangeLog
index 274c94d..2df8d6f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-25  Harish Krishnaswamy  <kharish@novell.com>
+
+       * configure.in: Modify camelproviderdir to use API_VERSION.
+       * evolution-data-server.pc.in: use VERSION instead of API_VERSION.
+
 2005-04-20  Ross Burton  <ross@burtonini.com>
 
        * src/offline-listener.c:

diff --git a/configure.in b/configure.in
index 24a1272..ce09070 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1130,7 +1130,7 @@ weatherdatadir="$privdatadir/weather"
 AC_SUBST(weatherdatadir)
 
 dnl separate camel from e-d-s?  or should it be under the same spot?  same for now.
-camel_providerdir="${privlibdir}/camel-providers"
+camel_providerdir='${libdir}'/evolution-data-server-$API_VERSION/camel-providers
 AC_SUBST(camel_providerdir)
 
 dnl ************************

diff --git a/evolution-data-server.pc.in b/evolution-data-server.pc.in
index 7b8b353..bbb0177 100644 (file)
--- a/evolution-data-server.pc.in
+++ b/evolution-data-server.pc.in
@@ -12,5 +12,5 @@ IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@
 
 Name: evolution-data-server
 Description: The evolution data server for the calendar and addressbook
-Version: @API_VERSION@
+Version: @VERSION@
 Requires: libgnome-2.0 libbonobo-2.0 >= @LIBBONOBO_REQUIRED@