[epiphany] Stop versioning the web extension directory



commit 6fa20334d09ae245a3c3b47bab924b56c601ccd7
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Mon Aug 8 07:21:19 2016 -0500

    Stop versioning the web extension directory
    
    It's misleading as it implies that it's possible to install multiple
    versions of Epiphany within the same prefix. It's not!
    
    Also, use pkglibdir here, that's what it's for.

 configure.ac                    |    1 -
 embed/Makefile.am               |    2 +-
 embed/web-extension/Makefile.am |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 525be55..002f2dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,6 @@ AC_CONFIG_MACRO_DIRS([m4 libgd])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([configure.ac])
 
-AC_SUBST([EPIPHANY_MAJOR],[epiphany_version_major.epiphany_version_minor])
 AC_SUBST([EPIPHANY_CHANGELOG_START],[epiphany_previous_version_major.epiphany_previous_version_minor.0])
 
 AX_CHECK_ENABLE_DEBUG([yes])
diff --git a/embed/Makefile.am b/embed/Makefile.am
index e885f6a..ee21ba3 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\" \
+       -DEPHY_WEB_EXTENSIONS_DIR=\"$(pkglibdir)/web-extensions\" \
        $(AM_CPPFLAGS)
 
 libephyembed_la_LDFLAGS = \
diff --git a/embed/web-extension/Makefile.am b/embed/web-extension/Makefile.am
index 6a452f5..176fd97 100644
--- a/embed/web-extension/Makefile.am
+++ b/embed/web-extension/Makefile.am
@@ -3,7 +3,7 @@ AM_LDFLAGS = $(WARN_LDFLAGS)
 
 webextension_LTLIBRARIES = libephywebextension.la
 
-webextensiondir = $(libdir)/epiphany/$(EPIPHANY_MAJOR)/web-extensions
+webextensiondir = $(pkglibdir)/web-extensions
 
 libephywebextension_la_SOURCES = \
        ephy-embed-form-auth.c          \


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