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

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    04/10/30 12:37:44

Modified files:
        .              : configure.ac 
        po             : Makefile.am 
Added files:
        po             : Makefile.in.in 
Removed files:
        po/wesnoth     : Makefile.in.in 
        po/wesnoth-editor: Makefile.in.in 
        po/wesnoth-ei  : Makefile.in.in 
        po/wesnoth-httt: Makefile.in.in 
        po/wesnoth-lib : Makefile.in.in 
        po/wesnoth-sotbe: Makefile.in.in 
        po/wesnoth-tdh : Makefile.in.in 
        po/wesnoth-trow: Makefile.in.in 

Log message:
        keep a single copy of modified-gettext Makefile.in.in and generate 
symlinks to it at configure-time

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.100&tr2=1.101&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/Makefile.in.in.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/Makefile.am.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: wesnoth/configure.ac
diff -u wesnoth/configure.ac:1.100 wesnoth/configure.ac:1.101
--- wesnoth/configure.ac:1.100  Tue Oct 26 19:17:20 2004
+++ wesnoth/configure.ac        Sat Oct 30 12:37:43 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.100 $])
+AC_REVISION([$Revision: 1.101 $])
 
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([foreign 1.5])
@@ -635,20 +635,26 @@
 
 
 #######################################################################
-# Symlinks that allow message catalogs to be used from build tree     #
+# Tune gettext stuff for our needs                                    #
 #######################################################################
 
 rm -rf translations
 case $srcdir in
-/*) podir=$srcdir/po ;;
-*)  podir=../../../$srcdir/po ;;
+/*) topdir=$srcdir ;;
+*)  topdir=`pwd`/$srcdir ;;
 esac
 for domain in `grep ^SUBDIRS $srcdir/po/Makefile.am | cut -d= -f2`
 do
+    # Symlinks to the single copy of Makefile.in.in
+    echo "creating po/$domain/Makefile.in.in"
+    rm -f po/$domain/Makefile.in.in
+    ln -s $topdir/po/Makefile.in.in po/$domain/Makefile.in.in
+
+    # Symlinks that allow message catalogs to be used from build tree
     for lang in `cat $srcdir/po/$domain/LINGUAS`
     do
         mkdir -p translations/$lang/LC_MESSAGES
-       ln -s $podir/$domain/$lang.gmo translations/$lang/LC_MESSAGES/$domain.mo
+       ln -s $topdir/po/$domain/$lang.gmo 
translations/$lang/LC_MESSAGES/$domain.mo
     done
 done
 
Index: wesnoth/po/Makefile.am
diff -u wesnoth/po/Makefile.am:1.3 wesnoth/po/Makefile.am:1.4
--- wesnoth/po/Makefile.am:1.3  Sun Oct 17 12:45:33 2004
+++ wesnoth/po/Makefile.am      Sat Oct 30 12:37:44 2004
@@ -4,3 +4,8 @@
        @for dir in $(SUBDIRS); do \
                ( cd $$dir && make $@ || exit $? ); \
        done
+
+clean-local:
+       @for dir in $(SUBDIRS); do \
+               rm -f $$dir/Makefile.in.in ; \
+       done