[Wesnoth-cvs-commits] wesnoth Makefile.am configure.ac

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    04/10/10 23:11:54

Modified files:
        .              : Makefile.am configure.ac 

Log message:
        changed default localedir to "translations"

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/Makefile.am.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.90&tr2=1.91&r1=text&r2=text

Patches:
Index: wesnoth/Makefile.am
diff -u wesnoth/Makefile.am:1.14 wesnoth/Makefile.am:1.15
--- wesnoth/Makefile.am:1.14    Sat Sep 11 19:45:10 2004
+++ wesnoth/Makefile.am Sun Oct 10 23:11:54 2004
@@ -54,7 +54,7 @@
        if test -d $(prefix) ; then echo `rmdir $(prefix)` ; fi
 
 clean-local:
-       rm -rf po/*/LC_MESSAGES
+       rm -rf translations
 
 BINARY_STAGING=/tmp/$(PACKAGE)-$(VERSION)-staging
 BINARY_DIST=/tmp/$(PACKAGE)-binary-$(VERSION).tar.gz
Index: wesnoth/configure.ac
diff -u wesnoth/configure.ac:1.90 wesnoth/configure.ac:1.91
--- wesnoth/configure.ac:1.90   Sun Oct 10 22:21:07 2004
+++ wesnoth/configure.ac        Sun Oct 10 23:11:54 2004
@@ -10,7 +10,7 @@
 dnl AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["devsrv.wesnoth.org"], [The default 
server for this version])
 AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["devsrv.wesnoth.org:14999"], [The default 
server for this version])
 
-AC_REVISION([$Revision: 1.90 $])
+AC_REVISION([$Revision: 1.91 $])
 
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([foreign 1.5])
@@ -57,12 +57,12 @@
 AC_SUBST([DATADIR])
 
 #LOCALEDIR="$datadir/locale"
-LOCALEDIR=po
+LOCALEDIR=translations
 AC_ARG_WITH([localedir],
-             [  --with-localedir=dir    install locale data under dir [[po]]],
+             [  --with-localedir=dir    install locale data under dir 
[[translations]]],
              [case "${withval}" in
               yes)
-                       LOCALEDIR="po"
+                       LOCALEDIR="translations"
                        ;;
                no)
                        ;;
@@ -555,13 +555,13 @@
 # Symlinks that allow message catalogs to be used from build tree     #
 #######################################################################
 
-for lang in `cat po/LINGUAS`
+rm -rf translations
+for domain in `grep SUBDIRS $srcdir/po/Makefile.am | cut -d= -f2`
 do
-    mkdir -p po/$lang/LC_MESSAGES
-    rm -f po/$lang/LC_MESSAGES/*
-    for domain in `cat po/DOMAINS`
+    for lang in `cat $srcdir/po/$domain/LINGUAS`
     do
-       ln -s ../$domain.gmo po/$lang/LC_MESSAGES/$domain.mo
+        mkdir -p translations/$lang/LC_MESSAGES
+       ln -s ../../../po/$domain/$lang.gmo 
translations/$lang/LC_MESSAGES/$domain.mo
     done
 done