diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2012-05-29 00:36:37 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2012-05-29 00:50:18 +0800 |
commit | 005ac1efa32c7e3a3dc5eb959b69fdee5fb91320 (patch) | |
tree | b7eaca0fc61577360d34e35464465d7232e4b414 /data | |
parent | 2c9f0932e8c2bc100f8ec7335a20fbfecea052a2 (diff) | |
download | gsoc2013-evolution-005ac1efa32c7e3a3dc5eb959b69fdee5fb91320.tar gsoc2013-evolution-005ac1efa32c7e3a3dc5eb959b69fdee5fb91320.tar.gz gsoc2013-evolution-005ac1efa32c7e3a3dc5eb959b69fdee5fb91320.tar.bz2 gsoc2013-evolution-005ac1efa32c7e3a3dc5eb959b69fdee5fb91320.tar.lz gsoc2013-evolution-005ac1efa32c7e3a3dc5eb959b69fdee5fb91320.tar.xz gsoc2013-evolution-005ac1efa32c7e3a3dc5eb959b69fdee5fb91320.tar.zst gsoc2013-evolution-005ac1efa32c7e3a3dc5eb959b69fdee5fb91320.zip |
Make the settings capplet optional.
The evolution-settings capplet was originally designed for Anjal, it was
used in MeeGo as part of the Express Mode effort, but doesn't really fit
in GNOME 3 nowadays (nor did it really fit in GNOME 2, in my opinion).
Add a --with-capplet configure switch defaulting to 'no'. The capplet
will eventually be removed unless I see someone actively maintaining it.
Diffstat (limited to 'data')
-rw-r--r-- | data/Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 9d9a8869c4..ea2ca3f6a4 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,7 +1,11 @@ SUBDIRS = icons +if WITH_CAPPLET +evolution_settings_desktop_in = evolution-settings.desktop.in +endif + desktopdir = $(datadir)/applications -desktop_in_files = evolution.desktop.in evolution-settings.desktop.in +desktop_in_files = evolution.desktop.in $(evolution_settings_desktop_in) desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) autostartdir = $(sysconfdir)/xdg/autostart |