[Freeciv-Dev] patch: i18n install dir (PR#86)

[dwp@xxxxxxxxxxxxxx]

This is a multi-part message in MIME format.

--_----------=_933396936299370
Content-Disposition: inline
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

On Thu, 29 Jul 1999 David Pfitzner <dwp@xxxxxxxxxxxxxx> wrote:

> Ok, I've enabled gettext support in the CVS version of freeciv.  

> It works for me on Linux, and it _almost_ works for me on Solaris:
> I just have to manually move or symlink an installed dir, because
> for some reason it installs to (prefix)/lib/locale/(etc)
> instead of (prefix)/share/locale/(etc) (which is what
> GNULOCALEDIR is defined to in config.h)  Not sure what the
> fix might be...

After much trial and error, I think the small attached patch
may be an appropriate fix.

-- David

--_----------=_933396936299370
Content-Disposition: inline; filename="locale_inst.diff"
Content-Type: text/plain; name="locale_inst.diff"
Content-Transfer-Encoding: 7bit

diff -u -r --exclude-from exclude_auto freeciv-mod/acconfig.h fc-adv/acconfig.h
--- freeciv-mod/acconfig.h      Thu Jul 29 00:16:46 1999
+++ fc-adv/acconfig.h   Sat Jul 31 14:21:55 1999
@@ -33,7 +33,7 @@
 #undef HAVE_GETTEXT
 #undef HAVE_LC_MESSAGES
 #undef HAVE_STPCPY
-#undef GNULOCALEDIR
+#undef LOCALEDIR
 
 
 @BOTTOM@
diff -u -r --exclude-from exclude_auto freeciv-mod/client/civclient.c 
fc-adv/client/civclient.c
--- freeciv-mod/client/civclient.c      Sat Jul 31 12:54:20 1999
+++ fc-adv/client/civclient.c   Sat Jul 31 14:22:26 1999
@@ -79,7 +79,7 @@
 {
 #ifdef ENABLE_NLS
   setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, GNULOCALEDIR);
+  bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain(PACKAGE);
 #endif
 
diff -u -r --exclude-from exclude_auto freeciv-mod/configure.in 
fc-adv/configure.in
--- freeciv-mod/configure.in    Sat Jul 31 10:54:37 1999
+++ fc-adv/configure.in Sat Jul 31 14:46:59 1999
@@ -32,9 +32,6 @@
 AC_DEFINE_UNQUOTED(VERSION_STRING, 
"${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")
 AC_DEFINE_UNQUOTED(IS_BETA_VERSION, $IS_BETA_VERSION)
 
-FC_EXPAND_DIR(GNULOCALEDIR, "$datadir/locale")
-AC_DEFINE_UNQUOTED(GNULOCALEDIR, "$GNULOCALEDIR")
-
 dnl Initialize automake stuff
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 
@@ -130,6 +127,11 @@
 dnl I18n support
 ALL_LINGUAS="pt es fr"
 AM_GNU_GETTEXT
+
+dnl DATADIRNAME is generated by AM_GNU_GETTEXT; 
+dnl note this has to match the path installed by po/Makefile
+FC_EXPAND_DIR(LOCALEDIR, '${prefix}/${DATADIRNAME}/locale')
+AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR")
 
 if test -n "$GCC"; then
    CFLAGS="$CFLAGS -Wall"
diff -u -r --exclude-from exclude_auto freeciv-mod/server/civserver.c 
fc-adv/server/civserver.c
--- freeciv-mod/server/civserver.c      Thu Jul 29 00:16:50 1999
+++ fc-adv/server/civserver.c   Sat Jul 31 14:22:12 1999
@@ -159,7 +159,7 @@
 
 #ifdef ENABLE_NLS
   setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, GNULOCALEDIR);
+  bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain(PACKAGE);
 #endif
 

--_----------=_933396936299370--