diff options
Diffstat (limited to 'mail/importers')
| -rw-r--r-- | mail/importers/Makefile.am | 4 | ||||
| -rw-r--r-- | mail/importers/netscape-importer.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am index e9d35224f1..b092cc3e96 100644 --- a/mail/importers/Makefile.am +++ b/mail/importers/Makefile.am @@ -10,11 +10,10 @@ INCLUDES = -I.. \ -I$(top_srcdir) \ -I$(top_srcdir)/shell \ -I$(top_builddir)/shell \ - -I$(includedir) \ -DG_LOG_DOMAIN=\"evolution-mail-importer\" \ -I$(top_srcdir)/addressbook/backend \ -I$(top_builddir)/addressbook/backend \ - -DEVOLUTION_DATADIR=\""$(datadir)"\" \ + -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ $(IMPORTERS_CFLAGS) liboutlook_la_SOURCES = \ @@ -82,7 +81,6 @@ libevolution_pine_importer_la_LIBADD = \ # $(IMPORTERS_LIBS) -serverdir = $(libdir)/bonobo/servers server_in_files = GNOME_Evolution_Mail_Mbox_Importer.server.in.in \ GNOME_Evolution_Mail_Outlook_Importer.server.in.in \ GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in \ diff --git a/mail/importers/netscape-importer.c b/mail/importers/netscape-importer.c index 501d7681ae..4a4ddd656e 100644 --- a/mail/importers/netscape-importer.c +++ b/mail/importers/netscape-importer.c @@ -1192,7 +1192,7 @@ netscape_import_filters (NsImporter *importer) fc = filter_context_new (); user = g_concat_dir_and_file (g_get_home_dir (), "evolution/filters.xml"); - system = EVOLUTION_DATADIR "/evolution-" BASE_VERSION "/filtertypes.xml"; + system = EVOLUTION_PRIVDATADIR "/filtertypes.xml"; if (rule_context_load ((RuleContext *)fc, system, user) < 0) { g_warning ("Could not load rule context."); |