diff options
| author | Michael Catanzaro <mcatanzaro@igalia.com> | 2015-06-29 15:06:40 -0500 |
|---|---|---|
| committer | Michael Catanzaro <mcatanzaro@igalia.com> | 2015-06-30 10:38:23 -0500 |
| commit | b73db5522be075a651a7b3a812ad726fde47f585 (patch) | |
| tree | 318b6c97709ae3b22ec104e56e5dff218fe300b0 | |
| parent | c205fbe91a1e725be4648688da4e35b8b352d1e6 (diff) | |
| download | epiphany-b73db5522be075a651a7b3a812ad726fde47f585.tar.gz | |
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.
| -rw-r--r-- | lib/Makefile.am | 1 | ||||
| -rw-r--r-- | lib/ephy-langs.c | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/ephy-main.c | 2 | ||||
| -rw-r--r-- | 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 5082d1fae..119b56ec8 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 208e3cb57..ccfcbc0c3 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 f851d0e1b..1491ac663 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 cce808688..02a02ef0c 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 6b3ba64d0..0d9858134 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); |