[goobox] removed custom definition of localedir
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [goobox] removed custom definition of localedir
- Date: Wed, 30 Mar 2016 09:33:52 +0000 (UTC)
commit 62740d549dfa1ddb7c4f02266150c0107d3ad830
Author: Paolo Bacchilega <paobac src gnome org>
Date: Wed Mar 30 11:30:55 2016 +0200
removed custom definition of localedir
configure.ac | 6 ------
src/Makefile.am | 5 +----
src/main.c | 2 +-
3 files changed, 2 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d60c1ec..03192b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -205,12 +205,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_ARG_ENABLE(deprecated,
diff --git a/src/Makefile.am b/src/Makefile.am
index 33ae162..950c49d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,10 +9,7 @@ uidir = $(datadir)/goobox/ui
endif
AM_CPPFLAGS = \
- -DGOO_PREFIX=\"$(prefix)\" \
- -DGOO_SYSCONFDIR=\"$(sysconfdir)\" \
- -DGOO_DATADIR=\"$(datadir)\" \
- -DGOO_LIBDIR=\"$(libdir)\" \
+ -DGOO_LOCALEDIR=\""$(localedir)"\" \
-DGOO_UIDIR=\""$(uidir)"\" \
$(GOO_CFLAGS) \
$(SMCLIENT_CFLAGS) \
diff --git a/src/main.c b/src/main.c
index ff8d715..06fe5f0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -57,7 +57,7 @@ main (int argc, char *argv[])
/* text domain */
- bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+ bindtextdomain (GETTEXT_PACKAGE, GOO_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]