From e579f544a2b6a513ce30a0404466b5ce1650d536 Mon Sep 17 00:00:00 2001
From: Harish Krishnaswamy <kharish@src.gnome.org>
Date: Mon, 4 Dec 2006 16:11:28 +0000
Subject: Fix installation problems on evolution.desktop, evolution.keys and
 evolution.mime.

svn path=/trunk/; revision=33051
---
 data/Makefile.am | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index e0cf14ad5c..0574e0de62 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -25,10 +25,10 @@ kdedesktop_file = $(desktop_in_in_file:.desktop.in.in=.desktop)
 install-kde-applnk:
 	$(mkinstalldirs) $(DESTDIR)$(kdedesktopdir);	\
 	$(INSTALL_DATA) $(kdedesktop_file) \
-		        $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file:.desktop=-$(BASE_VERSION).desktop)
+		        $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file)
 
 uninstall-kde-applnk:
-	rm -rf $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file:.desktop=-$(BASE_VERSION).desktop)
+	rm -rf $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file)
 
 else
 
@@ -45,16 +45,16 @@ 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 ;	\
+			$(DESTDIR)$(desktopdir)/$(desktop_file) ;	\
 	$(mkinstalldirs) $(DESTDIR)$(keysdir);								\
-	$(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file:.keys ;	\
+	$(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file) ;	\
 	$(mkinstalldirs) $(DESTDIR)$(mimedir);								\
-	$(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file:.mime ;
+	$(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file) ;
 
 uninstall-local: uninstall-kde-applnk
-	rm -rf $(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ; 	\
-	rm -rf $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ;	\
-	rm -rf $(DESTDIR)$(mimedir)/$(mime_file:.mime=-$(BASE_VERSION).mime) ;
+	rm -rf $(DESTDIR)$(desktopdir)/$(desktop_file) ; 	\
+	rm -rf $(DESTDIR)$(keysdir)/$(keys_file) ;	\
+	rm -rf $(DESTDIR)$(mimedir)/$(mime_file) ;
 
 # CDE Stuff
 
@@ -80,3 +80,4 @@ EXTRA_DIST =					\
 	$(keys_in_file)				\
 	$(noinst_MANS)
 
+
-- 
cgit