[evolution-data-server] Remove erroneous version number from ${privlibdir}.

[Matthew Barnes <mbarnes src gnome org>]

commit 5abba8fd5af4d03a24a2f04c42c6af044f6b5cab
Author: Matthew Barnes <mbarnes redhat com>
Date:   Thu Nov 1 09:35:00 2012 -0400

    Remove erroneous version number from ${privlibdir}.
    
    This slipped through because we don't actually reference ${privlibdir}
    in our backend/module/provider directory definitions.  Fix that too.
    
    Also, some pkg-config files needed to be tweaked as a result of this.

 addressbook/libedata-book/libedata-book.pc.in |    4 +++-
 calendar/libedata-cal/libedata-cal.pc.in      |    4 +++-
 camel/camel.pc.in                             |    3 ++-
 configure.ac                                  |   10 +++++-----
 libebackend/libebackend.pc.in                 |    2 ++
 5 files changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/addressbook/libedata-book/libedata-book.pc.in b/addressbook/libedata-book/libedata-book.pc.in
index c446dbb..0a1aa9a 100644
--- a/addressbook/libedata-book/libedata-book.pc.in
+++ b/addressbook/libedata-book/libedata-book.pc.in
@@ -3,12 +3,14 @@ exec_prefix= exec_prefix@
 libdir= libdir@
 libexecdir= libexecdir@
 includedir= includedir@
-backenddir= ebook_backenddir@
 datarootdir= datarootdir@
 datadir= datadir@
 
+privlibdir= privlibdir@
 privincludedir= privincludedir@
 
+backenddir= ebook_backenddir@
+
 Name: libedatabook
 Description: Backend library for evolution address books
 Version: @VERSION@
diff --git a/calendar/libedata-cal/libedata-cal.pc.in b/calendar/libedata-cal/libedata-cal.pc.in
index 336a5ad..1ffc5bd 100644
--- a/calendar/libedata-cal/libedata-cal.pc.in
+++ b/calendar/libedata-cal/libedata-cal.pc.in
@@ -3,12 +3,14 @@ exec_prefix= exec_prefix@
 libdir= libdir@
 libexecdir= libexecdir@
 includedir= includedir@
-backenddir= ecal_backenddir@
 datarootdir= datarootdir@
 datadir= datadir@
 
+privlibdir= privlibdir@
 privincludedir= privincludedir@
 
+backenddir= ecal_backenddir@
+
 Name: libedata-cal
 Description: Backend library for evolution calendars
 Version: @VERSION@
diff --git a/camel/camel.pc.in b/camel/camel.pc.in
index 06c7f07..8009590 100644
--- a/camel/camel.pc.in
+++ b/camel/camel.pc.in
@@ -3,10 +3,11 @@ exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
 
-camel_providerdir= camel_providerdir@
 privlibdir= privlibdir@
 privincludedir= privincludedir@
 
+camel_providerdir= camel_providerdir@
+
 Name: camel
 Description: the Evolution MIME message handling library
 Version: @VERSION@
diff --git a/configure.ac b/configure.ac
index 87ed00d..d6e478b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1442,19 +1442,19 @@ 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
 AC_SUBST(privlibdir)
 
 imagesdir='${datadir}'/pixmaps/evolution-data-server
 AC_SUBST(imagesdir)
 
-moduledir='${libdir}'/evolution-data-server/registry-modules
+moduledir='${privlibdir}'/registry-modules
 AC_SUBST(moduledir)
 
-ebook_backenddir='${libdir}'/evolution-data-server/addressbook-backends
+ebook_backenddir='${privlibdir}'/addressbook-backends
 AC_SUBST(ebook_backenddir)
 
-ecal_backenddir='${libdir}'/evolution-data-server/calendar-backends
+ecal_backenddir='${privlibdir}'/calendar-backends
 AC_SUBST(ecal_backenddir)
 
 ro_sourcesdir='${privdatadir}'/ro-sources
@@ -1469,7 +1469,7 @@ if test "x$use_gweather" = "xyes"; then
 fi
 
 dnl separate camel from e-d-s? or should it be under the same spot? same for now.
-camel_providerdir='${libdir}'/evolution-data-server/camel-providers
+camel_providerdir='${privlibdir}'/camel-providers
 AC_SUBST(camel_providerdir)
 
 dnl *******************
diff --git a/libebackend/libebackend.pc.in b/libebackend/libebackend.pc.in
index 3b42f68..becf4e7 100644
--- a/libebackend/libebackend.pc.in
+++ b/libebackend/libebackend.pc.in
@@ -5,7 +5,9 @@ includedir= includedir@
 datarootdir= datarootdir@
 datadir= datadir@
 
+privlibdir= privlibdir@
 privincludedir= privincludedir@
+
 moduledir= moduledir@
 
 Name: libebackend