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

diff --git a/ChangeLog b/ChangeLog
index 029ad9ec4fe65b57f3fe7ef35b13f6f121a9d24f..018a1025b0dbf05ca5389c346b3742192cde8687 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 1e61047e890d3706d6ffba1223c38ad6d2805697..04aa9e8daab6e217260f7660cc36fd82e54eaa04 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 7cbdd2493233f8fd7eeab23e6f36858e48a9ef88..f259c5bbf80357742263f92ced2edd7bb8187e7c 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 09be421fe80135b5f14c9b242a780a8c5192f15c..d96d3d007263f62b7cb678b9819e4a85b3a90c5a 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.