Bug 617865 - Various data file cleanups

- Install evolution-alarm-notify in $(privlibexecdir) instead of
  $(bindir).

- Set the X-GNOME-Bugzilla-Version in evolution-alarm-notify.desktop to
  @BASE_VERSION@.x (patch was missing the .x suffix).

- Killed data/evolution.keys.in.in since it's full of CORBA cruft.
  The MimeType field in evolution.desktop fills this role now.

- Copied the AS_AC_EXPAND macro from gnome-settings-daemon.  The macro
  sets up path-related substitutions for use in automake input files.

  So for example AS_AC_EXPAND(PRIVLIBEXECDIR, "$privlibexecdir") in
  configure.ac allows us to use @PRIVLIBEXECDIR@ in .desktop.in files.

- Simplified .desktop rules using gnome-settings-daemon as a guide.

1 files changed, 6 insertions, 0 deletions

diff --git a/configure.ac b/configure.ac
index 214132cd7b..285ee904e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1398,6 +1398,9 @@ AC_SUBST(viewsdir)
 privconduitdir="$privlibdir/conduits"
 AC_SUBST(privconduitdir)
 
+dnl For evolution-alarm-notify.desktop
+AS_AC_EXPAND(PRIVLIBEXECDIR, "$privlibexecdir")
+
 dnl ************************
 dnl Plugins
 dnl ************************
@@ -1675,6 +1678,9 @@ addressbook/tools/csv2vcard
 addressbook/util/Makefile
 art/Makefile
 data/Makefile
+data/evolution.desktop.in
+data/evolution-alarm-notify.desktop.in
+data/evolution-settings.desktop.in
 data/icons/Makefile
 doc/Makefile
 doc/reference/Makefile