From 4b815e3cf6363369470bb7a0ca90337e9cb54543 Mon Sep 17 00:00:00 2001
From: Rodney Dawes <dobey@ximian.com>
Date: Fri, 7 Feb 2003 20:45:12 +0000
Subject: Fix installation of desktop/mime files

2003-02-07  Rodney Dawes  <dobey@ximian.com>

	* data/Makefile.am: Fix installation of desktop/mime files

svn path=/trunk/; revision=19846
---
 data/Makefile.am | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 102b28ead7..b89fb62687 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,6 @@
 desktopdir = $(datadir)/applications
 desktop_in_file = evolution.desktop.in
-desktop_file = $(desktop_in_file:.desktop.in=.desktop)
+desktop_DATA = $(desktop_in_file:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 keysdir = $(datadir)/mime-info
@@ -27,8 +27,6 @@ endif
 
 noinst_MANS = evolution.1
 
-EXTRA_DIST = $(desktop_in_file) $(keys_in_file) $(mime_DATA) $(man_MANS)
-
 SUBDIRS = cde_app_root
 
 install-data-local: install-kde-applnk
@@ -55,7 +53,10 @@ dtappunintegrate:
 endif
 
 EXTRA_DIST =					\
+	$(desktop_DATA)				\
 	$(desktop_in_file)			\
 	$(mime_file)				\
-	$(keys_in_file)
+	$(keys_file)				\
+	$(keys_in_file)				\
+	$(noinst_MANS)
 
-- 
cgit v1.2.3