aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--data/Makefile.am2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b407c069e2..740e796eba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-30 Mike Castle <dalgoda@ix.netcom.com>
+
+ * data/Makefile.am (install-data-local): get the mime file from
+ src dir for srcdir != builddir
+
2004-04-30 Not Zed <NotZed@Ximian.com>
* tools/killev.c (main): use gnome_i18n_get_language_list so we
diff --git a/data/Makefile.am b/data/Makefile.am
index 8f2f1dc56f..6b3324e811 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -44,7 +44,7 @@ install-data-local: install-kde-applnk $(desktop_file) $(keys_file) $(mime_file)
$(mkinstalldirs) $(DESTDIR)$(keysdir); \
$(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ; \
$(mkinstalldirs) $(DESTDIR)$(mimedir); \
- $(INSTALL_DATA) $(mime_file) $(DESTDIR)$(mimedir)/$(mime_file:.mime=-$(BASE_VERSION).mime) ;
+ $(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file:.mime=-$(BASE_VERSION).mime) ;
# CDE Stuff