diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-05-18 03:42:11 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-05-18 04:34:13 +0800 |
| commit | 2bc81c527704c280323a8b1ab16338e132ecdd46 (patch) | |
| tree | 01627e5a494de97fbfa854744a38e1239175d27e /configure.ac | |
| parent | 24cf856a89418fd7d43028be6e9eabe21224e33c (diff) | |
| download | gsoc2013-evolution-2bc81c527704c280323a8b1ab16338e132ecdd46.tar gsoc2013-evolution-2bc81c527704c280323a8b1ab16338e132ecdd46.tar.gz gsoc2013-evolution-2bc81c527704c280323a8b1ab16338e132ecdd46.tar.bz2 gsoc2013-evolution-2bc81c527704c280323a8b1ab16338e132ecdd46.tar.lz gsoc2013-evolution-2bc81c527704c280323a8b1ab16338e132ecdd46.tar.xz gsoc2013-evolution-2bc81c527704c280323a8b1ab16338e132ecdd46.tar.zst gsoc2013-evolution-2bc81c527704c280323a8b1ab16338e132ecdd46.zip | |
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.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
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 |