[evolution/wip/webkit2] Fix the content editor web extension directory

[Tomas Popela <tpopela src gnome org>]

commit f711ade76f48bd1386e341849549e8d26514c9c1
Author: Tomas Popela <tpopela redhat com>
Date:   Tue May 31 09:21:59 2016 +0200

    Fix the content editor web extension directory

 e-util/Makefile.am                                 |    1 -
 modules/webkit-content-editor/Makefile.am          |    2 +-
 .../e-webkit-content-editor.c                      |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 8f9deb9..40ae077 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -97,7 +97,6 @@ libevolution_util_la_CPPFLAGS = \
        -DEVOLUTION_UIDIR=\""$(uidir)"\" \
        -DEVOLUTION_RULEDIR=\"$(ruledir)\" \
        -DEVOLUTION_WEB_EXTENSIONS_DIR=\""$(webextensionsdir)"\" \
-       -DEVOLUTION_WEB_EXTENSIONS_COMPOSER_DIR=\""$(webextensionscomposerdir)"\" \
        -DG_LOG_DOMAIN=\"evolution-util\" \
        $(EVOLUTION_DATA_SERVER_CFLAGS) \
        $(GNOME_PLATFORM_CFLAGS) \
diff --git a/modules/webkit-content-editor/Makefile.am b/modules/webkit-content-editor/Makefile.am
index 5330758..ef7ea31 100644
--- a/modules/webkit-content-editor/Makefile.am
+++ b/modules/webkit-content-editor/Makefile.am
@@ -5,7 +5,7 @@ module_LTLIBRARIES = module-webkit-content-editor.la
 module_webkit_content_editor_la_CPPFLAGS =             \
        $(AM_CPPFLAGS)                                  \
        -I$(top_srcdir)                                 \
-       -DEVOLUTION_WEB_EXTENSIONS_COMPOSER_DIR=\""$(webextensionscomposerdir)"\" \
+       -DEVOLUTION_WEB_EXTENSIONS_CONTENT_EDITOR_DIR=\""$(webextensionscontenteditordir)"\" \
        -DG_LOG_DOMAIN=\"webkit-content-editor\"        \
        $(EVOLUTION_DATA_SERVER_CFLAGS)                 \
        $(GNOME_PLATFORM_CFLAGS)                        \
diff --git a/modules/webkit-content-editor/e-webkit-content-editor.c 
b/modules/webkit-content-editor/e-webkit-content-editor.c
index 6165a2f..2160f14 100644
--- a/modules/webkit-content-editor/e-webkit-content-editor.c
+++ b/modules/webkit-content-editor/e-webkit-content-editor.c
@@ -4917,7 +4917,7 @@ webkit_content_editor_constructor (GType type,
                                web_context, WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER);
 
                        webkit_web_context_set_web_extensions_directory (
-                               web_context, EVOLUTION_WEB_EXTENSIONS_COMPOSER_DIR);
+                               web_context, EVOLUTION_WEB_EXTENSIONS_CONTENT_EDITOR_DIR);
 
                        g_value_take_object (param->value, web_context);
                }