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

Egor Vyscrebentsov wrote:
> <URL: http://bugs.freeciv.org/Ticket/Display.html?id=20534 >
> 
> On Wed, 20 Dec 2006 Christian Knoke wrote:
>> Jason Dorje Short wrote on Dec 19, 20:39 (-0800):
>>>>> Patch attached.
>>>> With your patch V21 SVN compiles, but the game is in english, not german
>>>> (except GTK buttons).
>>> It used to run in german properly?
>> Compilation of the S2_1 branch was fixed (for me) with the patch from
>> PR25944 around Dec, 9th. It broke again on Dec, 16 with the patch from
>> PR20534. With Christian P.'s patch it compiles again, but is now - for
>> the first time - in english language. This is the GTK2 client.
> 
> Does attached patch helps? (It works for me, even in rpm build.)

It shouldn't be needed to add fixes in 2 places.  Does this one also fix it?

-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