GNOME.org
 

[gnome-applets] i18n: use localedir

commit d3432d3a339f07494a9387f39e221f25f7169eb8
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sun Sep 27 18:54:07 2015 +0300

    i18n: use localedir

 accessx-status/Makefile.am     |    1 +
 battstat/Makefile.am           |    1 +
 brightness/Makefile.am         |    1 +
 charpick/Makefile.am           |    1 +
 configure.ac                   |    1 -
 cpufreq/src/Makefile.am        |    1 +
 drivemount/Makefile.am         |    1 +
 geyes/Makefile.am              |    1 +
 gweather/Makefile.am           |    1 +
 inhibit/Makefile.am            |    1 +
 mini-commander/src/Makefile.am |    1 +
 modemlights/Makefile.am        |    1 +
 multiload/Makefile.am          |    1 +
 netspeed/src/Makefile.am       |    2 +-
 stickynotes/Makefile.am        |    1 +
 tracker-search-bar/Makefile.am |    1 +
 trashapplet/src/Makefile.am    |    1 +
 windowpicker/src/Makefile.am   |    2 +-
 18 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/accessx-status/Makefile.am b/accessx-status/Makefile.am
index b30b7fa..3a5b61e 100644
--- a/accessx-status/Makefile.am
+++ b/accessx-status/Makefile.am
@@ -7,6 +7,7 @@ libexec_PROGRAMS = accessx-status-applet
 accessx_status_applet_CFLAGS = \
        -DACCESSX_PIXMAPS_DIR=\""$(datadir)/pixmaps/accessx-status-applet"\" \
        -DACCESSX_MENU_UI_DIR=\""$(uidir)"\" \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
        $(GNOME_APPLETS_CFLAGS) \
        $(GIO_CFLAGS) \
        $(GIO_UNIX_CFLAGS) \
diff --git a/battstat/Makefile.am b/battstat/Makefile.am
index 1bebe25..f381358 100644
--- a/battstat/Makefile.am
+++ b/battstat/Makefile.am
@@ -34,6 +34,7 @@ battstat_applet_2_CFLAGS = \
        $(ACPIINC)                              \
        -DG_LOG_DOMAIN=\"battstat_applet\"      \
        -DBATTSTAT_MENU_UI_DIR=\""$(uidir)"\" \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
        $(WARN_CFLAGS) \
        $(AM_CFLAGS) \
        $(NULL)
diff --git a/brightness/Makefile.am b/brightness/Makefile.am
index e6b84bb..51b2733 100644
--- a/brightness/Makefile.am
+++ b/brightness/Makefile.am
@@ -8,6 +8,7 @@ gnome_brightness_applet_CFLAGS = \
        -I.                                     \
        -I$(srcdir)                             \
        -DBRIGHTNESS_MENU_UI_DIR=\""$(uidir)"\" \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
        $(GNOME_APPLETS_CFLAGS)                 \
        $(WARN_CFLAGS) \
        $(AM_CFLAGS) \
diff --git a/charpick/Makefile.am b/charpick/Makefile.am
index 1d700dd..14bd4ec 100644
--- a/charpick/Makefile.am
+++ b/charpick/Makefile.am
@@ -6,6 +6,7 @@ charpick_applet2_CFLAGS = \
        -I.                                     \
        -I$(srcdir)                             \
        -DCHARPICK_MENU_UI_DIR=\""$(uidir)"\"   \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
        $(GNOME_APPLETS_CFLAGS)         \
        $(GUCHARMAP_CFLAGS) \
        $(WARN_CFLAGS) \
diff --git a/configure.ac b/configure.ac
index e2793ea..a2d8a36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -325,7 +325,6 @@ dnl ***************************************************************************
 GETTEXT_PACKAGE=gnome-applets-3.0
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package])
-AC_DEFINE_DIR(GNOMELOCALEDIR, "${datadir}/locale", [locale directory])
 AM_GLIB_GNU_GETTEXT
 
 # this is the directory where the *.{mo,gmo} files are installed
diff --git a/cpufreq/src/Makefile.am b/cpufreq/src/Makefile.am
index 54634b1..b7b8bbf 100644
--- a/cpufreq/src/Makefile.am
+++ b/cpufreq/src/Makefile.am
@@ -8,6 +8,7 @@ SUBDIRS = $(selector_SUBDIR)
 
 cpufreq_applet_CFLAGS = \
        -DCPUFREQ_MENU_UI_DIR=\""$(pkgdatadir)/ui"\"            \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
        $(GNOME_APPLETS_CFLAGS)                                 \
        $(LIBGLADE_CFLAGS)                                      \
        $(DBUS_CFLAGS) \
diff --git a/drivemount/Makefile.am b/drivemount/Makefile.am
index afb70d8..de5bd31 100644
--- a/drivemount/Makefile.am
+++ b/drivemount/Makefile.am
@@ -6,6 +6,7 @@ drivemount_applet2_CFLAGS = \
        -I.                                     \
        -I$(srcdir)                             \
        -DDRIVEMOUNT_MENU_UI_DIR=\""$(uidir)"\" \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
        $(GNOME_APPLETS_CFLAGS)                 \
        $(GIO_UNIX_CFLAGS) \
        $(WARN_CFLAGS) \
diff --git a/geyes/Makefile.am b/geyes/Makefile.am
index 409ebb4..b0b3ce9 100644
--- a/geyes/Makefile.am
+++ b/geyes/Makefile.am
@@ -9,6 +9,7 @@ geyes_applet2_CFLAGS = \
        -I$(includedir)                                 \
        -DGEYES_THEMES_DIR=\""$(pkgdatadir)/geyes/"\"   \
        -DGEYES_MENU_UI_DIR=\""$(uidir)"\" \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
        $(WARN_CFLAGS) \
        $(AM_CFLAGS) \
        $(NULL)
diff --git a/gweather/Makefile.am b/gweather/Makefile.am
index c35983f..3c3166e 100644
--- a/gweather/Makefile.am
+++ b/gweather/Makefile.am
@@ -6,6 +6,7 @@ gweather_applet_2_CFLAGS = \
        -I$(srcdir)                             \
        -I$(top_srcdir)                         \
        -DGWEATHER_MENU_UI_DIR=\""$(uidir)"\"   \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
        $(DBUS_CFLAGS)                          \
        $(GNOME_APPLETS_CFLAGS)         \
        $(DBUS_CFLAGS)                          \
diff --git a/inhibit/Makefile.am b/inhibit/Makefile.am
index dc87f17..b977516 100644
--- a/inhibit/Makefile.am
+++ b/inhibit/Makefile.am
@@ -6,6 +6,7 @@ gnome_inhibit_applet_CFLAGS = \
        -I.                                     \
        -I$(srcdir)                             \
        -DINHIBIT_MENU_UI_DIR=\""$(uidir)"\"    \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
        $(GNOME_APPLETS_CFLAGS) \
        $(WARN_CFLAGS) \
        $(AM_CFLAGS) \
diff --git a/mini-commander/src/Makefile.am b/mini-commander/src/Makefile.am
index db7c9e4..ec63de9 100644
--- a/mini-commander/src/Makefile.am
+++ b/mini-commander/src/Makefile.am
@@ -4,6 +4,7 @@ mini_commander_applet_CFLAGS = \
        -I.                             \
        -I$(srcdir)                     \
        -DMC_MENU_UI_DIR=\""$(uidir)"\" \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
        $(GNOME_APPLETS_CFLAGS) \
        $(GNOME_INCLUDEDIR) \
        $(WARN_CFLAGS) \
diff --git a/modemlights/Makefile.am b/modemlights/Makefile.am
index dc301c4..7ba0da1 100644
--- a/modemlights/Makefile.am
+++ b/modemlights/Makefile.am
@@ -4,6 +4,7 @@ modem_applet_CFLAGS = \
        -I. \
        -I$(srcdir) \
        -DMODEM_MENU_UI_DIR=\""$(uidir)"\"              \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
        $(GNOME_APPLETS_CFLAGS)                         \
        $(XML2_CFLAGS) \
        $(WARN_CFLAGS) \
diff --git a/multiload/Makefile.am b/multiload/Makefile.am
index f6462d8..db34c85 100644
--- a/multiload/Makefile.am
+++ b/multiload/Makefile.am
@@ -5,6 +5,7 @@ SUBDIRS = help
 multiload_applet_2_CFLAGS = \
        -I$(srcdir)             \
        -DMULTILOAD_MENU_UI_DIR=\""$(uidir)"\" \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
        $(GNOME_APPLETS_CFLAGS) \
        $(GTOP_APPLETS_CFLAGS)  \
        $(GIO_UNIX_CFLAGS) \
diff --git a/netspeed/src/Makefile.am b/netspeed/src/Makefile.am
index 12b4e4e..6a3eb25 100644
--- a/netspeed/src/Makefile.am
+++ b/netspeed/src/Makefile.am
@@ -3,7 +3,7 @@ NULL =
 uidir = $(pkgdatadir)/ui
 
 netspeed_applet2_CFLAGS = \
-       -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
        -DNETSPEED_MENU_UI_DIR=\""$(uidir)"\" \
        -I$(top_srcdir) \
        -I$(includedir) \
diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am
index 9ee69d7..d9bb894 100644
--- a/stickynotes/Makefile.am
+++ b/stickynotes/Makefile.am
@@ -16,6 +16,7 @@ gsettings_schemas_in_in = org.gnome.gnome-applets.stickynotes.gschema.xml.in.in
 if BUILD_STICKYNOTES_APPLET
 stickynotes_applet_CFLAGS = \
        -DSTICKYNOTES_MENU_UI_DIR=\""$(uidir)"\" \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
        -I.                                     \
        -I$(srcdir)                             \
        $(GNOME_APPLETS_CFLAGS)                 \
diff --git a/tracker-search-bar/Makefile.am b/tracker-search-bar/Makefile.am
index 8cca213..dd9b4dd 100644
--- a/tracker-search-bar/Makefile.am
+++ b/tracker-search-bar/Makefile.am
@@ -1,6 +1,7 @@
 NULL =
 
 tracker_search_bar_CFLAGS = \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
        -I.                                     \
        -I$(srcdir)                             \
        $(GNOME_APPLETS_CFLAGS)                 \
diff --git a/trashapplet/src/Makefile.am b/trashapplet/src/Makefile.am
index 07c9f9a..cf881de 100644
--- a/trashapplet/src/Makefile.am
+++ b/trashapplet/src/Makefile.am
@@ -2,6 +2,7 @@ NULL =
 
 trashapplet_CPPFLAGS = \
        -DTRASH_MENU_UI_DIR=\""$(pkgdatadir)/ui"\" \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
        -I$(top_srcdir) \
        $(GNOME_APPLETS_CFLAGS) \
        $(GIO_CFLAGS) \
diff --git a/windowpicker/src/Makefile.am b/windowpicker/src/Makefile.am
index 0db9b8e..76fc91e 100644
--- a/windowpicker/src/Makefile.am
+++ b/windowpicker/src/Makefile.am
@@ -14,7 +14,7 @@ wp-resources.c wp-resources.h: \
 
 libwindow_picker_applet_la_CFLAGS = \
        -D_GNU_SOURCE \
-       -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
        -DWNCK_I_KNOW_THIS_IS_UNSTABLE=1 \
        -DGTK_DISABLE_SINGLE_INCLUDES \
        -I$(top_builddir) \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]