aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--data/Makefile.am9
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 6586cc52c4..26a8ce5550 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-07 Rodney Dawes <dobey@ximian.com>
+
+ * data/Makefile.am: Fix installation of desktop/mime files
+
2003-02-06 Ettore Perazzoli <ettore@ximian.com>
* configure.in: Add fr to ALL_LINGUAS again.
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)