--- data/Makefile.am.orig	2006-11-21 11:18:28.552759057 +0100
+++ data/Makefile.am	2006-11-21 11:22:08.661273800 +0100
@@ -25,10 +25,10 @@ kdedesktop_file = $(desktop_in_in_file:.
 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