[tracker/tracker-0.8] evolution: Moved miner desktop file to same location as others in data/miners

[Martyn James Russell <mr src gnome org>]

commit eb3989b9680c3841444fb4095e3d12de32e915ff
Author: Martyn Russell <martyn lanedo com>
Date:   Tue May 11 16:47:16 2010 +0100

    evolution: Moved miner desktop file to same location as others in data/miners

 data/miners/Makefile.am                            |    5 +++++
 .../miners/tracker-miner-evolution.desktop.in      |    0
 src/plugins/evolution/Makefile.am                  |    9 ---------
 3 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/data/miners/Makefile.am b/data/miners/Makefile.am
index d0b331c..8ef03ed 100644
--- a/data/miners/Makefile.am
+++ b/data/miners/Makefile.am
@@ -2,6 +2,7 @@ include $(top_srcdir)/Makefile.decl
 
 desktop_in_files = \
 	tracker-miner-applications.desktop.in	\
+	tracker-miner-evolution.desktop.in	\
 	tracker-miner-files.desktop.in		\
 	tracker-miner-rss.desktop.in
 
@@ -11,6 +12,10 @@ tracker_miners_DATA = \
 	tracker-miner-applications.desktop \
 	tracker-miner-files.desktop
 
+if HAVE_MINER_EVOLUTION
+tracker_miners_DATA += tracker-miner-evolution.desktop
+endif
+
 if HAVE_MINER_RSS
 tracker_miners_DATA += tracker-miner-rss.desktop
 endif
diff --git a/src/plugins/evolution/tracker-miner-emails.desktop.in b/data/miners/tracker-miner-evolution.desktop.in
similarity index 100%
rename from src/plugins/evolution/tracker-miner-emails.desktop.in
rename to data/miners/tracker-miner-evolution.desktop.in
diff --git a/src/plugins/evolution/Makefile.am b/src/plugins/evolution/Makefile.am
index b143c2e..2e0e51f 100644
--- a/src/plugins/evolution/Makefile.am
+++ b/src/plugins/evolution/Makefile.am
@@ -44,15 +44,8 @@ liborg_freedesktop_Tracker_evolution_plugin_la_LIBADD = 		\
 	$(DBUS_LIBS)							\
 	$(GCOV_LIBS)
 
-desktop_in_files = tracker-miner-emails.desktop.in
-
-tracker_minersdir = $(datadir)/tracker/miners
-
-tracker_miners_DATA = tracker-miner-emails.desktop
-
 @INTLTOOL_DESKTOP_RULE@
 
-
 %-glue.h: %.xml
 	$(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^
 
@@ -61,10 +54,8 @@ BUILT_SOURCES = 							\
 
 CLEANFILES = 								\
 	$(BUILT_SOURCES) 						\
-	$(tracker_miners_DATA)						\
 	org-freedesktop-Tracker-evolution-plugin.eplug
 
 EXTRA_DIST =								\
 	$(service_DATA)							\
-	$(desktop_in_files)						\
 	org-freedesktop-Tracker-evolution-plugin.eplug.xml