[epiphany] Replace SHARE_DIR with PKGDATADIR

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 926196d141969873c872d953763cd0d773278183
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Aug 7 15:17:07 2016 -0500

    Replace SHARE_DIR with PKGDATADIR

 embed/Makefile.am               |    2 +-
 embed/ephy-embed-prefs.c        |    2 +-
 embed/web-extension/Makefile.am |    1 -
 lib/Makefile.am                 |    9 ++++-----
 lib/ephy-file-helpers.c         |    6 +++---
 lib/history/Makefile.am         |    1 -
 lib/widgets/Makefile.am         |    1 -
 7 files changed, 9 insertions(+), 13 deletions(-)
---
diff --git a/embed/Makefile.am b/embed/Makefile.am
index f503421..45e91de 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             \
        -DDATADIR=\"$(datadir)\"                \
-       -DSHARE_DIR=\"$(pkgdatadir)\"           \
+       -DPKGDATADIR=\"$(pkgdatadir)\"          \
        -DEPHY_WEB_EXTENSIONS_DIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/web-extensions\" \
        $(AM_CPPFLAGS)
 
diff --git a/embed/ephy-embed-prefs.c b/embed/ephy-embed-prefs.c
index 1a9b588..702483a 100644
--- a/embed/ephy-embed-prefs.c
+++ b/embed/ephy-embed-prefs.c
@@ -118,7 +118,7 @@ webkit_pref_get_vendor_user_agent (void)
 
   branding_keyfile = g_key_file_new ();
 
-  if (g_key_file_load_from_file (branding_keyfile, SHARE_DIR "/branding.conf",
+  if (g_key_file_load_from_file (branding_keyfile, PKGDATADIR "/branding.conf",
                                  G_KEY_FILE_NONE, NULL)) {
     char *vendor;
     char *vendor_sub;
diff --git a/embed/web-extension/Makefile.am b/embed/web-extension/Makefile.am
index b02476d..043462d 100644
--- a/embed/web-extension/Makefile.am
+++ b/embed/web-extension/Makefile.am
@@ -23,7 +23,6 @@ libephywebextension_la_SOURCES = \
 
 libephywebextension_la_CPPFLAGS = \
        -I$(top_srcdir)/lib     \
-       -DSHARE_DIR=\"$(pkgdatadir)\"                   \
        -DTOP_SRC_DATADIR=\"$(top_srcdir)/data\"        \
        $(AM_CPPFLAGS)
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index ae3b871..a1b58aa 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -72,8 +72,8 @@ libephymisc_la_CPPFLAGS = \
        -DABS_TOP_BUILD_DIR=\"$(abs_top_builddir)\"     \
        -DDATADIR=\"$(datadir)\"                        \
        -DLOCALEDIR=\"$(localedir)\"                    \
+       -DPKGDATADIR=\"$(pkgdatadir)\"                  \
        -DPKGLIBEXECDIR=\"$(pkglibexecdir)\"            \
-       -DSHARE_DIR=\"$(pkgdatadir)\"                   \
        -DTOP_SRC_DATADIR=\"$(top_srcdir)/data\"        \
        -I$(top_builddir)/lib                           \
        -I$(top_srcdir)/lib/egg                         \
@@ -126,11 +126,10 @@ ephy_profile_migrator_CFLAGS = \
        $(AM_CFLAGS)
 
 ephy_profile_migrator_CPPFLAGS = \
-       -I$(top_builddir)/lib \
-       -I$(srcdir)/history \
-       -DSHARE_DIR=\"$(pkgdatadir)\" \
+       -I$(top_builddir)/lib           \
+       -I$(srcdir)/history             \
        -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
-       -DLOCALEDIR=\"$(localedir)\" \
+       -DLOCALEDIR=\"$(localedir)\"    \
        $(AM_CPPFLAGS)
 
 ephy_profile_migrator_LDADD = \
diff --git a/lib/ephy-file-helpers.c b/lib/ephy-file-helpers.c
index 0545733..699f0ae 100644
--- a/lib/ephy-file-helpers.c
+++ b/lib/ephy-file-helpers.c
@@ -223,9 +223,9 @@ ephy_file (const char *filename)
     TOP_SRC_DATADIR "/icons/",
     TOP_SRC_DATADIR "/pages/",
 #endif
-    SHARE_DIR "/",
-    SHARE_DIR "/icons/",
-    SHARE_DIR "/pages/"
+    PKGDATADIR "/",
+    PKGDATADIR "/icons/",
+    PKGDATADIR "/pages/"
   };
 
   g_assert (files != NULL);
diff --git a/lib/history/Makefile.am b/lib/history/Makefile.am
index cb4f21b..2af2609 100644
--- a/lib/history/Makefile.am
+++ b/lib/history/Makefile.am
@@ -25,7 +25,6 @@ libephyhistory_la_CPPFLAGS = \
        -I$(top_builddir)/lib           \
        -I$(top_builddir)/lib/history   \
        -I$(top_srcdir)/lib             \
-       -DSHARE_DIR=\"$(pkgdatadir)\"   \
        $(AM_CPPFLAGS)
 
 libephyhistory_la_LDFLAGS = \
diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am
index e210a6f..a9b2e7e 100644
--- a/lib/widgets/Makefile.am
+++ b/lib/widgets/Makefile.am
@@ -94,7 +94,6 @@ libephywidgets_la_CPPFLAGS = \
        -I$(top_srcdir)/lib/egg         \
        -I$(top_srcdir)/lib/history     \
        -I$(top_srcdir)/libgd           \
-       -DSHARE_DIR=\"$(pkgdatadir)\"   \
        $(AM_CPPFLAGS)
 
 libephywidgets_la_CFLAGS = \