[epiphany] Revert "Install the web extension to pkglibdir"

[Michael Catanzaro <mcatanzaro src gnome org>]

commit ae01bfbf837958754cd9eaf91ee34681ae53c6f5
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Mon Aug 8 07:18:30 2016 -0500

    Revert "Install the web extension to pkglibdir"
    
    This reverts commit 947c58ddcfeaa71d11b64b4caeae9b7e9f09f7b0.
    
    It conflicts with the possibility of converting our convenience
    libraries into private shared libraries.

 embed/Makefile.am               |    2 +-
 embed/ephy-embed-shell.c        |    2 +-
 embed/web-extension/Makefile.am |    4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/embed/Makefile.am b/embed/Makefile.am
index 0b875a8..e885f6a 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -70,7 +70,7 @@ libephyembed_la_CPPFLAGS = \
        -I$(top_srcdir)/lib/history             \
        -I$(top_srcdir)/lib/widgets             \
        -DPKGDATADIR=\"$(pkgdatadir)\"          \
-       -DPKGLIBDIR=\"$(pkglibdir)\"            \
+       -DEPHY_WEB_EXTENSIONS_DIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/web-extensions\" \
        $(AM_CPPFLAGS)
 
 libephyembed_la_LDFLAGS = \
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index 82a137d..cd74f7d 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -533,7 +533,7 @@ initialize_web_extensions (WebKitWebContext *web_context,
   gboolean private_profile;
   const char *address;
 
-  webkit_web_context_set_web_extensions_directory (web_context, PKGLIBDIR);
+  webkit_web_context_set_web_extensions_directory (web_context, EPHY_WEB_EXTENSIONS_DIR);
 
   address = priv->dbus_server ? g_dbus_server_get_client_address (priv->dbus_server) : NULL;
 
diff --git a/embed/web-extension/Makefile.am b/embed/web-extension/Makefile.am
index f820f8c..6a452f5 100644
--- a/embed/web-extension/Makefile.am
+++ b/embed/web-extension/Makefile.am
@@ -1,7 +1,9 @@
 AM_CFLAGS = $(WARN_CFLAGS)
 AM_LDFLAGS = $(WARN_LDFLAGS)
 
-pkglib_LTLIBRARIES = libephywebextension.la
+webextension_LTLIBRARIES = libephywebextension.la
+
+webextensiondir = $(libdir)/epiphany/$(EPIPHANY_MAJOR)/web-extensions
 
 libephywebextension_la_SOURCES = \
        ephy-embed-form-auth.c          \