aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/Makefile.am3
2 files changed, 7 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 6b88363369..002e22547c 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-23 Dan Winship <danw@ximian.com>
+
+ * Makefile.am (INCLUDES): Define CAMEL_PROVIDERDIR to be the
+ configure.in-defined camel_providerdir. (Was supposed to have been
+ committed a month ago... oops.)
+
2002-01-22 Jeffrey Stedfast <fejj@ximian.com>
* mail-ops.c (mail_filter_folder): Now takes a boolean notify
diff --git a/mail/Makefile.am b/mail/Makefile.am
index ae5d1e267c..fe9eb71142 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -2,7 +2,6 @@ SUBDIRS = importers
bin_PROGRAMS = evolution-mail
-providerdir = $(libdir)/evolution/camel-providers/$(VERSION)
importerdir = $(libdir)/evolution/evolution-mail-importers/$(VERSION)
INCLUDES = \
@@ -24,7 +23,7 @@ INCLUDES = \
-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
-DEVOLUTION_BUTTONSDIR=\""$(buttonsdir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
- -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" \
+ -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
-DMAIL_IMPORTERSDIR=\""$(importerdir)"\" \
-DG_LOG_DOMAIN=\"evolution-mail\"