[Wesnoth-cvs-commits] wesnoth configure.ac changelog

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    05/04/05 15:22:56

Modified files:
        .              : configure.ac changelog 

Log message:
        have config.status create the translations dir instead of configure 
itself; create it in $srcdir, since an out-of-tree builddir is not a suitable 
datadir; do not attempt to do so when $srcdir is not writable (eg. source tree 
on a read-only network filesystem); robustified the symlink creation

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.132&tr2=1.133&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/changelog.diff?tr1=1.560&tr2=1.561&r1=text&r2=text

Patches:
Index: wesnoth/changelog
diff -u wesnoth/changelog:1.560 wesnoth/changelog:1.561
--- wesnoth/changelog:1.560     Tue Apr  5 13:13:09 2005
+++ wesnoth/changelog   Tue Apr  5 15:22:56 2005
@@ -119,6 +119,7 @@
  * improved threading of campaign server
  * fixed the dialog menus being larger than the screen
  * made the game remember the last server used for downloading campaings
+ * when building out of the source tree, configure now creates the 
translations/ directory in the source tree, but does not attempt to do so if it 
is read-only
  * code refactoring and dependency cleanups
  * various bug fixes and code cleanups
 
Index: wesnoth/configure.ac
diff -u wesnoth/configure.ac:1.132 wesnoth/configure.ac:1.133
--- wesnoth/configure.ac:1.132  Tue Apr  5 15:03:03 2005
+++ wesnoth/configure.ac        Tue Apr  5 15:22:56 2005
@@ -37,7 +37,7 @@
 EOF
 ])
 
-AC_REVISION([$Revision: 1.132 $])
+AC_REVISION([$Revision: 1.133 $])
 
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_SRCDIR([src/actions.cpp])
@@ -730,7 +730,8 @@
 # Tune gettext stuff for our needs                                    #
 #######################################################################
 
-rm -rf translations
+AC_CONFIG_COMMANDS([translations],
+[rm -rf translations
 case $srcdir in
 /*) topdir=$srcdir ;;
 *)  topdir=`pwd`/$srcdir ;;
@@ -744,12 +745,15 @@
     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 $topdir/po/$domain/$lang.gmo 
translations/$lang/LC_MESSAGES/$domain.mo
-    done
-done
+    if test -w $srcdir; then
+       for lang in `cat $srcdir/po/$domain/LINGUAS`
+       do
+           mkdir -p $srcdir/translations/$lang/LC_MESSAGES
+           rm -f $srcdir/translations/$lang/LC_MESSAGES/$domain.mo
+           ln -s $topdir/po/$domain/$lang.gmo 
$srcdir/translations/$lang/LC_MESSAGES/$domain.mo
+       done
+    fi
+done])
 
 #######################################################################
 # Data file substitution.                                             #