From 53837df6ae13d51568aefdab5bdcb110b939e406 Mon Sep 17 00:00:00 2001 From: Harish Krishnaswamy Date: Tue, 14 Nov 2006 18:03:37 +0000 Subject: Install evolution.desktop instead of evolution-.desktop. 2006-11-14 Harish Krishnaswamy * data/Makefile.am: Install evolution.desktop instead of evolution-.desktop. svn path=/trunk/; revision=32975 --- ChangeLog | 5 +++++ data/Makefile.am | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0d674a549e..a365ac91fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-11-14 Harish Krishnaswamy + + * data/Makefile.am: Install evolution.desktop + instead of evolution-.desktop. + 2006-11-14 Harish Krishnaswamy * configure.in: Add targets help/quickref/es/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 934d1c6a4b..e0cf14ad5c 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -45,11 +45,11 @@ SUBDIRS = cde_app_root install-data-local: install-kde-applnk $(desktop_file) $(keys_file) $(mime_file) $(mkinstalldirs) $(DESTDIR)$(desktopdir); \ $(INSTALL_DATA) $(desktop_file) \ - $(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ; \ + $(DESTDIR)$(desktopdir)/$(desktop_file:.desktop ; \ $(mkinstalldirs) $(DESTDIR)$(keysdir); \ - $(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ; \ + $(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file:.keys ; \ $(mkinstalldirs) $(DESTDIR)$(mimedir); \ - $(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file:.mime=-$(BASE_VERSION).mime) ; + $(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file:.mime ; uninstall-local: uninstall-kde-applnk rm -rf $(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ; \ -- cgit v1.2.3