[gthumb] removed custom definition of localedir



commit 3fefa38f769b9789e6d35b01aa16539252c80194
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Wed Mar 30 11:25:02 2016 +0200

    removed custom definition of localedir

 configure.ac       |    6 ------
 gthumb/Makefile.am |    2 +-
 gthumb/main.c      |    2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 74ae35c..31e4720 100644
--- a/configure.ac
+++ b/configure.ac
@@ -296,12 +296,6 @@ AC_SUBST([GETTEXT_PACKAGE])
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
 AM_GLIB_GNU_GETTEXT
 
-if test "x${prefix}" = "xNONE"; then
-       AC_DEFINE_UNQUOTED(LOCALEDIR, "${ac_default_prefix}/${DATADIRNAME}/locale", [Locale directory])
-else
-       AC_DEFINE_UNQUOTED(LOCALEDIR, "${prefix}/${DATADIRNAME}/locale", [Locale directory])
-fi
-
 dnl ===========================================================================
 
 AC_MSG_CHECKING([for some Win32 platform])
diff --git a/gthumb/Makefile.am b/gthumb/Makefile.am
index fb68e9e..b6bb120 100644
--- a/gthumb/Makefile.am
+++ b/gthumb/Makefile.am
@@ -332,11 +332,11 @@ gthumb_CFLAGS =                                                   \
        $(LIBCHAMPLAIN_CFLAGS)                                  \
        $(SMCLIENT_CFLAGS)                                      \
        $(LCMS2_CFLAGS)                                                 \
-       -DGTHUMB_LOCALEDIR=\"$(datadir)/locale\"                \
        -DGTHUMB_PREFIX=\"$(prefix)\"                           \
        -DGTHUMB_SYSCONFDIR=\"$(sysconfdir)\"                   \
        -DGTHUMB_LIBDIR=\"$(libdir)\"                           \
        -DGTHUMB_PKGDATADIR=\"$(pkgdatadir)\"                   \
+       -DGTHUMB_LOCALEDIR=\"$(localedir)\"                     \
        -DGTHUMB_UI_DIR=\"$(ui_dir)\"                           \
        -DGTHUMB_ICON_DIR=\"$(icon_dir)\"                       \
        -DGTHUMB_EXTENSIONS_UI_DIR=\"$(extensions_ui_dir)\"     \
diff --git a/gthumb/main.c b/gthumb/main.c
index 21098f5..121baa8 100644
--- a/gthumb/main.c
+++ b/gthumb/main.c
@@ -483,7 +483,7 @@ main (int argc, char *argv[])
 
        /* text domain */
 
-       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+       bindtextdomain (GETTEXT_PACKAGE, GTHUMB_LOCALEDIR);
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
        textdomain (GETTEXT_PACKAGE);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]