[epiphany] Install the web extension to pkglibdir



commit 947c58ddcfeaa71d11b64b4caeae9b7e9f09f7b0
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Aug 7 15:38:25 2016 -0500

    Install the web extension to pkglibdir
    
    This attempt to namespace the web extension falls a bit flat, as it's
    not possible to install multiple copies of Epiphany under the same
    prefix. If you really want to do that, please be advised that crack is
    whack.

 embed/Makefile.am               |    2 +-
 embed/ephy-embed-shell.c        |    2 +-
 embed/web-extension/Makefile.am |    4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/embed/Makefile.am b/embed/Makefile.am
index e885f6a..0b875a8 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)\"          \
-       -DEPHY_WEB_EXTENSIONS_DIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/web-extensions\" \
+       -DPKGLIBDIR=\"$(pkglibdir)\"            \
        $(AM_CPPFLAGS)
 
 libephyembed_la_LDFLAGS = \
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index cd74f7d..82a137d 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, EPHY_WEB_EXTENSIONS_DIR);
+  webkit_web_context_set_web_extensions_directory (web_context, PKGLIBDIR);
 
   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 6a452f5..f820f8c 100644
--- a/embed/web-extension/Makefile.am
+++ b/embed/web-extension/Makefile.am
@@ -1,9 +1,7 @@
 AM_CFLAGS = $(WARN_CFLAGS)
 AM_LDFLAGS = $(WARN_LDFLAGS)
 
-webextension_LTLIBRARIES = libephywebextension.la
-
-webextensiondir = $(libdir)/epiphany/$(EPIPHANY_MAJOR)/web-extensions
+pkglib_LTLIBRARIES = libephywebextension.la
 
 libephywebextension_la_SOURCES = \
        ephy-embed-form-auth.c          \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]