[Freeciv-Dev] (PR#10421) LOCALEDIR doesn't use correct datadir

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=10421 >

> [jdorje - Mon Oct 04 05:38:47 2004]:
> 
> You can set the datadir via --datadir=${datadir}.  This is respected by 
> po/Makefile.in.in which uses $datadir/locale as the LOCALEDIR.  However 
> configure.ac uses ${prefix}/share/locale as the LOCALEDIR.  Of course 
> the default datadir is ${prefix}/share so this doesn't normally cause 
> problems.  But if you set the datadir at configure-time to be different 
> it won't work.  This was noticed by James when working on win32 (which 
> has a different filesystem structure and a different datadir).
> 
> The attached patch should fix it.

Except that we have to use " instead of '.  I have no idea what ' means
anyway...?

jason

Index: configure.ac
===================================================================
RCS file: /home/freeciv/CVS/freeciv/configure.ac,v
retrieving revision 1.79
diff -u -r1.79 configure.ac
--- configure.ac        1 Oct 2004 08:07:25 -0000       1.79
+++ configure.ac        4 Oct 2004 06:46:56 -0000
@@ -257,7 +257,7 @@
 
 
 dnl note this has to match the path installed by po/Makefile
-FC_EXPAND_DIR(LOCALEDIR, '${prefix}/share/locale')
+FC_EXPAND_DIR(LOCALEDIR, "$datadir/locale")
 AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR", [Locale directory])
 
 EXTRA_GCC_DEBUG_CFLAGS=""
Index: configure.in
===================================================================
RCS file: /home/freeciv/CVS/freeciv/configure.in,v
retrieving revision 1.255
diff -u -r1.255 configure.in
--- configure.in        1 Oct 2004 08:07:26 -0000       1.255
+++ configure.in        4 Oct 2004 06:46:56 -0000
@@ -256,7 +256,7 @@
 
 
 dnl note this has to match the path installed by po/Makefile
-FC_EXPAND_DIR(LOCALEDIR, '${prefix}/share/locale')
+FC_EXPAND_DIR(LOCALEDIR, "$datadir/locale")
 AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR")
 
 EXTRA_GCC_DEBUG_CFLAGS=""