<URL: http://bugs.freeciv.org/Ticket/Display.html?id=20534 >

In a similar problem, there is now in config.h

  #define LOCALEDIR "${prefix}/share/locale"

Which apparently prevents translations from every working, as the
catalogs can't be found (when autogen is run with a sufficiently new
version of autoconf).

The fix is simple.  Also, because $localedir is its own variable (with a
--localedir configure option) this can be used directly.

-jason
Index: configure.ac
===================================================================
--- configure.ac	(revision 12423)
+++ configure.ac	(working copy)
@@ -342,11 +342,9 @@
 
 dnl note this has to match the path installed by po/Makefile
 if test x"$MINGW32" != "xyes"; then
-  FC_EXPAND_DIR(LOCALEDIR, "$datadir/locale")
-  AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR", [Locale directory])
+  CPPFLAGS="$CFLAGS -DLOCALEDIR=\"\\\"$localedir\"\\\""
 else
-  FC_EXPAND_DIR(LOCALEDIR, './share/locale')
-  AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR", [Locale directory])
+  AC_DEFINE_UNQUOTED(LOCALEDIR, "./share/locale", [Locale directory (windows)])
 fi  
 
 dnl Check libUTF8
Index: po/Makefile.in.in
===================================================================
--- po/Makefile.in.in	(revision 12423)
+++ po/Makefile.in.in	(working copy)
@@ -23,7 +23,7 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 datadir = @datadir@
-localedir = $(datadir)/locale
+localedir = @localedir@
 gettextsrcdir = $(datadir)/gettext/po
 
 INSTALL = @INSTALL@
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to