From e1d82ba4411bccb19a4ad9ff48aa56776f7c43e4 Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Thu, 7 Feb 2008 11:36:34 +0100 Subject: [PATCH] Fix expansion when setting LOCALEDIR Use the localedir variable so configure's --localedir option is honoured. Expand the variable twice to first expand the datadir and then the prefix variable referenced by datadir. Noticed by Witold, who also made a similar fix (modulo --localedir) in elinks-0.12 098fb87065e2c69f4f9ef65d16901e336a72b789. --- configure.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 7a3a4808..c3112a17 100644 --- a/configure.in +++ b/configure.in @@ -1275,7 +1275,9 @@ AC_DEFINE_UNQUOTED(CONFDIR, "$CONFDIR", [Directory containing default config]) AC_SUBST(CONFDIR) # Create LOCALEDIR #define for config.h -LOCALEDIR=`eval echo "$datadir/locale"` +test -z "$localedir" && localedir="$datadir/locale" +localedir0=`eval echo "$localedir"` +LOCALEDIR=`eval echo "$localedir0"` AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR", [Directory containing locales]) AC_SUBST(LOCALEDIR) -- 2.11.4.GIT