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

Egor Vyscrebentsov wrote on Dec 20, 03:59 (-0800):
> 

> > 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.)

Yes, it does!

Christian

> diff -urN freeciv-2.1.0-orig/configure.ac freeciv-2.1.0/configure.ac
> --- freeciv-2.1.0-orig/configure.ac   2006-12-19 23:56:33 +0300
> +++ freeciv-2.1.0/configure.ac        2006-12-20 12:21:56 +0300
> @@ -340,6 +340,10 @@
>    LIBS="$LIBS -lwsock32"
>  fi
>  
> +if test -z "$localedir"; then
> +  localedir="$datadir/locale"
> +fi
> +
>  dnl note this has to match the path installed by po/Makefile
>  if test x"$MINGW32" != "xyes"; then
>   CPPFLAGS="$CFLAGS -DLOCALEDIR=\"\\\"$localedir\\\"\""
> diff -urN freeciv-2.1.0-orig/m4/po.m4 freeciv-2.1.0/m4/po.m4
> --- freeciv-2.1.0-orig/m4/po.m4       1970-01-01 03:00:00 +0300
> +++ freeciv-2.1.0/m4/po.m4    2006-12-20 12:14:56 +0300
> @@ -0,0 +1,6 @@
> +
> +dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
> +dnl have to define it here, so that it can be used in po/Makefile.
> +test -n "$localedir" || localedir='${datadir}/locale'
> +AC_SUBST([localedir])
> +


-- 
Christian Knoke            * * *            http://cknoke.de
* * * * * * * * *  Ceterum censeo Microsoft esse dividendum.



_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to