[tracker/evo-new-api: 5/9] Evolution: Fix module install directory.

[Martyn James Russell <mr src gnome org>]

commit 2e918fcbc054a22ee5f2969b5f09c11a99677315
Author: Matthew Barnes <mbarnes redhat com>
Date:   Thu Jul 5 16:01:37 2012 -0400

    Evolution: Fix module install directory.

 configure.ac                      |    5 +----
 src/plugins/evolution/Makefile.am |    4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 04746fa..8d355b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1147,10 +1147,7 @@ if test "x$have_tracker_miner_evolution" = "xyes"; then
                AS_HELP_STRING([--with-evolution-plugin-dir],
                               [path to Evolution plugin directory]))
    if test "x$with_evolution_plugin_dir" = "x" ; then
-      tracker_miner_evolution_install_dir=`$PKG_CONFIG $evolution_plugin_name --variable=privlibdir`
-      if test -n "$tracker_miner_evolution_install_dir" ; then
-         tracker_miner_evolution_install_dir="$tracker_miner_evolution_install_dir/modules"
-      fi
+      tracker_miner_evolution_install_dir=`$PKG_CONFIG --variable=moduledir evolution-shell-3.0`
    else
       tracker_miner_evolution_install_dir="$with_tracker_miner_evolution_install_dir"
    fi
diff --git a/src/plugins/evolution/Makefile.am b/src/plugins/evolution/Makefile.am
index 99df051..c380659 100644
--- a/src/plugins/evolution/Makefile.am
+++ b/src/plugins/evolution/Makefile.am
@@ -8,9 +8,9 @@ AM_CPPFLAGS =                                          \
 	-DLOCALEDIR="\"$(localedir)\""                 \
 	$(TRACKER_MINER_EVOLUTION_CFLAGS)
 
-eplugindir = $(TRACKER_MINER_EVOLUTION_INSTALL_DIR)
+moduledir = $(TRACKER_MINER_EVOLUTION_INSTALL_DIR)
 
-eplugin_LTLIBRARIES = liborg-freedesktop-Tracker-evolution-plugin.la
+module_LTLIBRARIES = liborg-freedesktop-Tracker-evolution-plugin.la
 
 # module_flags = -module -avoid-version -no-undefined