[epiphany] Avoid conflating of datadir and pkgdatadir

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 87caf42797e49a557842742625e5327ff9b3656d
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Aug 7 15:26:55 2016 -0500

    Avoid conflating of datadir and pkgdatadir
    
    This is ludicrously confusing.

 src/Makefile.am                |    2 +-
 src/bookmarks/Makefile.am      |    2 +-
 src/bookmarks/ephy-bookmarks.c |    2 +-
 src/window-commands.c          |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 6856b15..c207557 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -77,8 +77,8 @@ libephymain_la_CPPFLAGS = \
        -I$(top_srcdir)/lib/history     \
        -I$(top_srcdir)/lib/widgets     \
        -I$(top_srcdir)/src/bookmarks   \
-       -DDATADIR=\"$(pkgdatadir)\"     \
        -DLOCALEDIR=\"$(localedir)\"    \
+       -DPKGDATADIR=\"$(pkgdatadir)\"  \
        $(AM_CPPFLAGS)
 
 libephymain_la_CFLAGS = \
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index 905993f..38d642c 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -115,7 +115,7 @@ libephybookmarks_la_CPPFLAGS = \
        -I$(top_srcdir)/lib/widgets     \
        -I$(top_srcdir)/lib/history     \
        -I$(top_srcdir)/lib/egg         \
-       -DDATADIR=\"$(pkgdatadir)\"     \
+       -DPKGDATADIR=\"$(pkgdatadir)\"  \
        $(AM_CPPFLAGS)
 
 libephybookmarks_la_LDFLAGS = \
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index d00e723..debfeda 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -112,7 +112,7 @@ ephy_bookmarks_init_defaults (EphyBookmarks *eb)
     ephy_bookmarks_add_keyword (eb, _(default_topics[i]));
   }
 
-  ephy_bookmarks_import_rdf (eb, DATADIR "/default-bookmarks.rdf");
+  ephy_bookmarks_import_rdf (eb, PKGDATADIR "/default-bookmarks.rdf");
 }
 
 static void
diff --git a/src/window-commands.c b/src/window-commands.c
index 8d3ed38..fd423c8 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -176,7 +176,7 @@ window_cmd_show_about (GSimpleAction *action,
   gsize n_authors, n_contributors, n_past_authors, n_artists, n_documenters, i, j;
 
   key_file = g_key_file_new ();
-  if (!g_key_file_load_from_file (key_file, DATADIR G_DIR_SEPARATOR_S "about.ini",
+  if (!g_key_file_load_from_file (key_file, PKGDATADIR G_DIR_SEPARATOR_S "about.ini",
                                   0, &error)) {
     g_warning ("Couldn't load about data: %s\n", error->message);
     g_error_free (error);