Set LOCALEDIR via make rather than configure, as per Autoconf manual.

diff --git a/ChangeLog b/ChangeLog
index 029ad9e..018a102 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2010-04-15  Roland McGrath  <roland@redhat.com>
 
-       * configure.ac (LOCALEDIR): Use $localedir, not $datadir.
+       * configure.ac (LOCALEDIR, DATADIRNAME): Removed.
 
 2009-09-21  Ulrich Drepper  <drepper@redhat.com>
 

diff --git a/config/ChangeLog b/config/ChangeLog
index 1e61047..04aa9e8 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-15  Roland McGrath  <roland@redhat.com>
+
+       * eu.am (DEFS): Add -DLOCALEDIR=... here.
+
 2010-02-15  Roland McGrath  <roland@redhat.com>
 
        * eu.am: New file.

diff --git a/config/eu.am b/config/eu.am
index 7cbdd24..f259c5b 100644 (file)
--- a/config/eu.am
+++ b/config/eu.am
@@ -25,7 +25,7 @@
 ## <http://www.openinventionnetwork.com>.
 ##
 
-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 09be421..d96d3d0 100644 (file)
--- 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.