From b386ccfe5439f6ed886f87d47259886e6fdc54a1 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 15 Apr 2010 14:01:05 -0700 Subject: [PATCH] Set LOCALEDIR via make rather than configure, as per Autoconf manual. --- ChangeLog | 2 +- config/ChangeLog | 4 ++++ config/eu.am | 2 +- configure.ac | 8 -------- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 029ad9ec4..018a1025b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ 2010-04-15 Roland McGrath - * configure.ac (LOCALEDIR): Use $localedir, not $datadir. + * configure.ac (LOCALEDIR, DATADIRNAME): Removed. 2009-09-21 Ulrich Drepper diff --git a/config/ChangeLog b/config/ChangeLog index 1e61047e8..04aa9e8da 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2010-04-15 Roland McGrath + + * eu.am (DEFS): Add -DLOCALEDIR=... here. + 2010-02-15 Roland McGrath * eu.am: New file. diff --git a/config/eu.am b/config/eu.am index 7cbdd2493..f259c5bbf 100644 --- a/config/eu.am +++ b/config/eu.am @@ -25,7 +25,7 @@ ## . ## -DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H +DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"' INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. AM_CFLAGS = -std=gnu99 -Wall -Wshadow \ $(if $($(*F)_no_Werror),,-Werror) \ diff --git a/configure.ac b/configure.ac index 09be421fe..d96d3d007 100644 --- a/configure.ac +++ b/configure.ac @@ -90,14 +90,6 @@ LDFLAGS="$save_LDFLAGS"]) AS_IF([test "x$ac_cv_tls" != xyes], AC_MSG_ERROR([__thread support required])) -LOCALEDIR=$localedir -AC_SUBST(LOCALEDIR) -AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR") -AH_TEMPLATE([LOCALEDIR], [Directory to place translation files in.]) - -DATADIRNAME=$datadir -AC_SUBST(DATADIRNAME) - dnl This test must come as early as possible after the compiler configuration dnl tests, because the choice of the file model can (in principle) affect dnl whether functions and headers are available, whether they work, etc. -- 2.47.2