aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--data/Makefile.am6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d674a549e..a365ac91fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-11-14 Harish Krishnaswamy <kharish@novell.com>
+ * data/Makefile.am: Install evolution.desktop
+ instead of evolution-<version>.desktop.
+
+2006-11-14 Harish Krishnaswamy <kharish@novell.com>
+
* configure.in: Add targets help/quickref/es/Makefile
and mail/default/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) ; \