diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | data/Makefile.am | 15 | ||||
| -rw-r--r-- | data/evolution.desktop.in | 4 |
3 files changed, 23 insertions, 9 deletions
@@ -1,3 +1,16 @@ +2003-06-23 Ettore Perazzoli <ettore@ximian.com> + + * data/Makefile.am: Added implicity rule to subst @BASE_VERSION@ + in evolution.desktop.in.in to generate evolution.desktop.in. + (desktop_in_file): Removed. + (desktop_in_in_file): New. + (kdedesktop_file): Update substitution to use + $(desktop_in_in_file) instead of $(desktop_in_file). + (noinst_DATA): Add $(desktop_file). + (install-data-local): Depend on $(mime_file) and $(keys_file). + (EXTRA_DIST): Remove $(desktop_file), replace $(desktop_in_file) + with $(desktop_in_in_file). + 2003-06-19 Dan Winship <danw@ximian.com> * tools/killev.c (kill_component): clean this up a little and make diff --git a/data/Makefile.am b/data/Makefile.am index c189698047..3bc4b3aaae 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,6 +1,8 @@ desktopdir = $(datadir)/applications -desktop_in_file = evolution.desktop.in -desktop_file = $(desktop_in_file:.desktop.in=.desktop) +desktop_in_in_file = evolution.desktop.in.in +desktop_file = $(desktop_in_in_file:.desktop.in.in=.desktop) +%.desktop.in: %.desktop.in.in + sed -e "s|\@BASE_VERSION\@|$(BASE_VERSION)|" $< > $@ @INTLTOOL_DESKTOP_RULE@ keysdir = $(datadir)/mime-info @@ -14,7 +16,7 @@ mime_file = evolution.mime if HAVE_KDE_APPLNK kdedesktopdir = $(KDE_APPLNK_DIR)/Applications -kdedesktop_file = $(desktop_in_file:.desktop.in=.desktop) +kdedesktop_file = $(desktop_in_in_file:.desktop.in.in=.desktop) install-kde-applnk: $(mkinstalldirs) $(DESTDIR)$(kdedesktopdir); \ @@ -27,11 +29,11 @@ install-kde-applnk: endif noinst_MANS = evolution.1 -noinst_DATA = $(keys_file) +noinst_DATA = $(keys_file) $(desktop_file) SUBDIRS = cde_app_root -install-data-local: install-kde-applnk +install-data-local: install-kde-applnk $(desktop_file) $(keys_file) $(mime_file) $(mkinstalldirs) $(DESTDIR)$(desktopdir); \ $(INSTALL_DATA) $(desktop_file) \ $(DESTDIR)$(desktopdir)/$(desktop_file:.desktop.in=-$(BASE_VERSION).desktop) ; \ @@ -55,8 +57,7 @@ dtappunintegrate: endif EXTRA_DIST = \ - $(desktop_file) \ - $(desktop_in_file) \ + $(desktop_in_in_file) \ $(mime_file) \ $(keys_file) \ $(keys_in_file) \ diff --git a/data/evolution.desktop.in b/data/evolution.desktop.in index 60e4cb8efa..2fc62f6993 100644 --- a/data/evolution.desktop.in +++ b/data/evolution.desktop.in @@ -1,8 +1,8 @@ [Desktop Entry] _Name=Ximian Evolution _Comment=The Evolution groupware suite -Exec=evolution-1.3 -Icon=evolution-1.3.png +Exec=evolution-1.4 +Icon=evolution-1.4.png Terminal=false Type=Application Categories=GNOME;Application;Office;X-Red-Hat-Base; |