[epiphany/wip/i18n: 3/4] Use plain LOCALEDIR

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 06903d59b08220e7463782991a819c534ddfe74b
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Mon Jun 29 15:06:40 2015 -0500

    Use plain LOCALEDIR
    
    The variable rename is itself of no consequence, just to be more
    standard. But $(localedir) may not necessarily be $(datadir)/locale, so
    this aspect of the change makes a real difference.

 lib/Makefile.am                 |    1 +
 lib/ephy-langs.c                |    6 ++----
 src/Makefile.am                 |    6 +++---
 src/ephy-main.c                 |    2 +-
 src/ephy-search-provider-main.c |    2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5082d1f..119b56e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -86,6 +86,7 @@ libephymisc_la_CPPFLAGS = \
        -DSHARE_DIR=\"$(pkgdatadir)\"               \
        -DTOP_SRC_DATADIR=\"$(top_srcdir)/data\"    \
        -DABS_TOP_BUILD_DIR=\"$(abs_top_builddir)\" \
+       -DLOCALEDIR=\"$(localedir)\"                \
        $(AM_CPPFLAGS)
 
 libephymisc_la_CFLAGS = \
diff --git a/lib/ephy-langs.c b/lib/ephy-langs.c
index 208e3cb..ccfcbc0 100644
--- a/lib/ephy-langs.c
+++ b/lib/ephy-langs.c
@@ -150,8 +150,6 @@ ephy_langs_get_languages (void)
        return (char **) g_array_free (array, FALSE);
 }
 
-#define ISOCODESLOCALEDIR      ISO_CODES_PREFIX "/share/locale"
-
 static void
 ephy_langs_bind_iso_domains (void)
 {
@@ -159,10 +157,10 @@ ephy_langs_bind_iso_domains (void)
 
        if (bound == FALSE)
        {
-               bindtextdomain (ISO_639_DOMAIN, ISOCODESLOCALEDIR);
+               bindtextdomain (ISO_639_DOMAIN, LOCALEDIR);
                bind_textdomain_codeset (ISO_639_DOMAIN, "UTF-8");
 
-               bindtextdomain(ISO_3166_DOMAIN, ISOCODESLOCALEDIR);
+               bindtextdomain(ISO_3166_DOMAIN, LOCALEDIR);
                bind_textdomain_codeset (ISO_3166_DOMAIN, "UTF-8");
 
                bound = TRUE;
diff --git a/src/Makefile.am b/src/Makefile.am
index f851d0e..1491ac6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -92,7 +92,7 @@ libephymain_la_CPPFLAGS = \
        -I$(top_srcdir)/src/bookmarks   \
        -DLOADER_DIR=\""$(pkglibdir)/$(EPIPHANY_MAJOR)/loaders"\"               \
        -DDATADIR=\""$(pkgdatadir)"\"   \
-       -DGNOMELOCALEDIR=\"$(datadir)/locale\"  \
+       -DLOCALEDIR=\"$(localedir)\"    \
        $(AM_CPPFLAGS)
 
 libephymain_la_CFLAGS = \
@@ -152,7 +152,7 @@ epiphany_CPPFLAGS = \
        -I$(top_srcdir)/src/bookmarks   \
        -DDATADIR=\""$(datadir)"\"      \
        -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
-       -DGNOMELOCALEDIR=\"$(datadir)/locale\"  \
+       -DLOCALEDIR=\"$(localedir)\"    \
        $(AM_CPPFLAGS)
 
 epiphany_CFLAGS = \
@@ -187,7 +187,7 @@ epiphany_search_provider_CPPFLAGS = \
        -I$(top_srcdir)/src/bookmarks   \
        -DDATADIR=\""$(datadir)"\"      \
        -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
-       -DGNOMELOCALEDIR=\"$(datadir)/locale\"  \
+       -DLOCALEDIR=\"$(localedir)\"    \
        $(AM_CPPFLAGS)
 
 epiphany_search_provider_CFLAGS = $(epiphany_CFLAGS)
diff --git a/src/ephy-main.c b/src/ephy-main.c
index cce8086..02a02ef 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -239,7 +239,7 @@ main (int argc,
   EphyFileHelpersFlags flags;
 
   /* Initialize the i18n stuff */
-  bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
diff --git a/src/ephy-search-provider-main.c b/src/ephy-search-provider-main.c
index 6b3ba64..0d98581 100644
--- a/src/ephy-search-provider-main.c
+++ b/src/ephy-search-provider-main.c
@@ -33,7 +33,7 @@ gint main (gint argc, gchar** argv)
   GError *error = NULL;
 
   /* Initialize the i18n stuff */
-  bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);