[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth ./Makefile.in ./configure ./configure.a...
|
From: |
Yann Dirson |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth ./Makefile.in ./configure ./configure.a... |
|
Date: |
Fri, 03 Sep 2004 11:13:43 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Yann Dirson <address@hidden> 04/09/03 15:08:53
Modified files:
. : Makefile.in configure configure.ac
icons : Makefile.in
m4 : Makefile.in
po : Makefile.in.in
src : Makefile.am Makefile.in filesystem.cpp
src/server : Makefile.in
src/tools : Makefile.in
src/zip : Makefile.in
Log message:
install message catalogs together with other wesnoth data by default
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/Makefile.in.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.diff?tr1=1.97&tr2=1.98&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.79&tr2=1.80&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/icons/Makefile.in.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/m4/Makefile.in.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/Makefile.in.in.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/Makefile.am.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/Makefile.in.diff?tr1=1.68&tr2=1.69&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/filesystem.cpp.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/server/Makefile.in.diff?tr1=1.41&tr2=1.42&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/tools/Makefile.in.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/zip/Makefile.in.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
Patches:
Index: wesnoth/Makefile.in
diff -u wesnoth/Makefile.in:1.39 wesnoth/Makefile.in:1.40
--- wesnoth/Makefile.in:1.39 Fri Sep 3 11:29:56 2004
+++ wesnoth/Makefile.in Fri Sep 3 15:08:51 2004
@@ -126,6 +126,7 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FONT_FILES = @FONT_FILES@
+FULLLOCALEDIR = @FULLLOCALEDIR@
GCC_FALSE = @GCC_FALSE@
GCC_TRUE = @GCC_TRUE@
GENCAT = @GENCAT@
Index: wesnoth/configure
diff -u wesnoth/configure:1.97 wesnoth/configure:1.98
--- wesnoth/configure:1.97 Fri Sep 3 11:29:56 2004
+++ wesnoth/configure Fri Sep 3 15:08:51 2004
@@ -312,7 +312,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL
AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE MAINT MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT
MSGMERGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include
am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE
am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu
host_vendor host_os RANLIB ac_ct_RANLIB CPP EGREP ALLOCA GLIBC21
HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV
INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME
INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL
LTLIBINTL POSUB DATADIR LOCALEDIR STATIC_TRUE STATIC_FALSE SERVER_TRUE
SERVER_FALSE EDITOR_TRUE EDITOR_FALSE TOOLS_TRUE TOOLS_FALSE KDE_TRUE KDE_FALSE
GNOME1_TRUE GNOME1_FALSE GNOME2_TRUE GNOME2_FALSE GCC_TRUE GCC_FALSE WZIP_TRUE
WZIP_FALSE INCLUDEDINTL_TRUE INCLUDEDINTL_FALSE CXX CXXFLAGS ac_ct_CXX
CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE X_CFLAGS X_PRE_LIBS X_LIBS
X_EXTRA_LIBS X11_TRUE X11_FALSE SDL_CONFIG PNG_CONFIG PNG_CFLAGS PNG_LIBS
LIBPNG_TRUE LIBPNG_FALSE GNOME_CONFIG GNOME1_DESKTOP KDE_CONFIG KDE_DESKTOP
KDE_ICON LTOOL LDPREFIX SDL_LIBS SDL_IMAGE_LIBS SDL_MIXER_LIBS SDL_NET_LIBS
SDL_TTF_LIBS SDL_CFLAGS LIBOBJS LITE_TRUE LITE_FALSE MANUAL_FILES DATA_FILES
FONT_FILES IMAGE_FILES MUSIC_FILES SOUND_FILES UTIL_FILES LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL
AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE MAINT MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT
MSGMERGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include
am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE
am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu
host_vendor host_os RANLIB ac_ct_RANLIB CPP EGREP ALLOCA GLIBC21
HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV
INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME
INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL
LTLIBINTL POSUB DATADIR LOCALEDIR FULLLOCALEDIR STATIC_TRUE STATIC_FALSE
SERVER_TRUE SERVER_FALSE EDITOR_TRUE EDITOR_FALSE TOOLS_TRUE TOOLS_FALSE
KDE_TRUE KDE_FALSE GNOME1_TRUE GNOME1_FALSE GNOME2_TRUE GNOME2_FALSE GCC_TRUE
GCC_FALSE WZIP_TRUE WZIP_FALSE INCLUDEDINTL_TRUE INCLUDEDINTL_FALSE CXX
CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE X_CFLAGS
X_PRE_LIBS X_LIBS X_EXTRA_LIBS X11_TRUE X11_FALSE SDL_CONFIG PNG_CONFIG
PNG_CFLAGS PNG_LIBS LIBPNG_TRUE LIBPNG_FALSE GNOME_CONFIG GNOME1_DESKTOP
KDE_CONFIG KDE_DESKTOP KDE_ICON LTOOL LDPREFIX SDL_LIBS SDL_IMAGE_LIBS
SDL_MIXER_LIBS SDL_NET_LIBS SDL_TTF_LIBS SDL_CFLAGS LIBOBJS LITE_TRUE
LITE_FALSE MANUAL_FILES DATA_FILES FONT_FILES IMAGE_FILES MUSIC_FILES
SOUND_FILES UTIL_FILES LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -892,7 +892,7 @@
--with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
--without-libintl-prefix don't search for libintl in includedir and
libdir
--with-datadir-name[=dir] change name of data directory. [wesnoth]
- --with-localedir=dir install locale data under dir [$datadir/locale]
+ --with-localedir=dir install locale data under dir [po]
--with-kde enable installation of icon and KDE menu entry
--with-gnome enable installation of icon and GNOME menu entry
--with-x use the X Window System
@@ -9892,14 +9892,15 @@
fi;
-LOCALEDIR="$datadir/locale"
+#LOCALEDIR="$datadir/locale"
+LOCALEDIR=po
# Check whether --with-localedir or --without-localedir was given.
if test "${with_localedir+set}" = set; then
withval="$with_localedir"
case "${withval}" in
yes)
- LOCALEDIR="$datadir/locale"
+ LOCALEDIR="po"
;;
no)
;;
@@ -9910,6 +9911,14 @@
fi;
+set -x
+case "`eval echo \"$LOCALEDIR\"`" in
+/*) FULLLOCALEDIR="$LOCALEDIR" ;;
+*) FULLLOCALEDIR='${datadir}/${DATADIR}/${LOCALEDIR}' ;;
+esac
+set +x
+
+
# Check whether --enable-server or --disable-server was given.
if test "${enable_server+set}" = set; then
enableval="$enable_server"
@@ -17097,6 +17106,7 @@
s,@POSUB@,$POSUB,;t t
s,@DATADIR@,$DATADIR,;t t
s,@LOCALEDIR@,$LOCALEDIR,;t t
+s,@FULLLOCALEDIR@,$FULLLOCALEDIR,;t t
s,@STATIC_TRUE@,$STATIC_TRUE,;t t
s,@STATIC_FALSE@,$STATIC_FALSE,;t t
s,@SERVER_TRUE@,$SERVER_TRUE,;t t
Index: wesnoth/configure.ac
diff -u wesnoth/configure.ac:1.79 wesnoth/configure.ac:1.80
--- wesnoth/configure.ac:1.79 Fri Sep 3 11:29:56 2004
+++ wesnoth/configure.ac Fri Sep 3 15:08:51 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.79 $])
+AC_REVISION([$Revision: 1.80 $])
AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE([foreign 1.5])
@@ -56,12 +56,13 @@
esac])
AC_SUBST([DATADIR])
-LOCALEDIR="$datadir/locale"
+#LOCALEDIR="$datadir/locale"
+LOCALEDIR=po
AC_ARG_WITH([localedir],
- [ --with-localedir=dir install locale data under dir
[[$datadir/locale]]],
+ [ --with-localedir=dir install locale data under dir [[po]]],
[case "${withval}" in
yes)
- LOCALEDIR="$datadir/locale"
+ LOCALEDIR="po"
;;
no)
;;
@@ -71,6 +72,14 @@
esac])
AC_SUBST([LOCALEDIR])
+set -x
+case "`eval echo \"$LOCALEDIR\"`" in
+/*) FULLLOCALEDIR="$LOCALEDIR" ;;
+*) FULLLOCALEDIR='${datadir}/${DATADIR}/${LOCALEDIR}' ;;
+esac
+set +x
+AC_SUBST([FULLLOCALEDIR])
+
AC_ARG_ENABLE([server],
[ --enable-server enable compilation of server],
[server=$enableval],
Index: wesnoth/icons/Makefile.in
diff -u wesnoth/icons/Makefile.in:1.31 wesnoth/icons/Makefile.in:1.32
--- wesnoth/icons/Makefile.in:1.31 Fri Sep 3 11:29:56 2004
+++ wesnoth/icons/Makefile.in Fri Sep 3 15:08:52 2004
@@ -110,6 +110,7 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FONT_FILES = @FONT_FILES@
+FULLLOCALEDIR = @FULLLOCALEDIR@
GCC_FALSE = @GCC_FALSE@
GCC_TRUE = @GCC_TRUE@
GENCAT = @GENCAT@
Index: wesnoth/m4/Makefile.in
diff -u wesnoth/m4/Makefile.in:1.11 wesnoth/m4/Makefile.in:1.12
--- wesnoth/m4/Makefile.in:1.11 Fri Sep 3 11:29:56 2004
+++ wesnoth/m4/Makefile.in Fri Sep 3 15:08:52 2004
@@ -93,6 +93,7 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FONT_FILES = @FONT_FILES@
+FULLLOCALEDIR = @FULLLOCALEDIR@
GCC_FALSE = @GCC_FALSE@
GCC_TRUE = @GCC_TRUE@
GENCAT = @GENCAT@
Index: wesnoth/po/Makefile.in.in
diff -u wesnoth/po/Makefile.in.in:1.11 wesnoth/po/Makefile.in.in:1.12
--- wesnoth/po/Makefile.in.in:1.11 Fri Sep 3 11:29:56 2004
+++ wesnoth/po/Makefile.in.in Fri Sep 3 15:08:52 2004
@@ -24,7 +24,9 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
datadir = @datadir@
-localedir = @LOCALEDIR@
+DATADIR = @DATADIR@
+LOCALEDIR = @LOCALEDIR@
+localedir = @FULLLOCALEDIR@
gettextsrcdir = $(datadir)/gettext/po
INSTALL = @INSTALL@
Index: wesnoth/src/Makefile.am
diff -u wesnoth/src/Makefile.am:1.47 wesnoth/src/Makefile.am:1.48
--- wesnoth/src/Makefile.am:1.47 Fri Sep 3 11:29:56 2004
+++ wesnoth/src/Makefile.am Fri Sep 3 15:08:52 2004
@@ -306,7 +306,8 @@
widgets/widget.hpp \
wesconfig.h
-AM_CXXFLAGS = @SDL_CFLAGS@ -DWESNOTH_PATH=\"$(pkgdatadir)\"
-DLOCALEDIR=\"$(LOCALEDIR)\" \
+AM_CXXFLAGS = @SDL_CFLAGS@ -DWESNOTH_PATH=\"$(pkgdatadir)\" \
+ -DLOCALEDIR=\"$(LOCALEDIR)\" -DFULLLOCALEDIR=\"$(FULLLOCALEDIR)\" \
-I../intl -I$(top_srcdir)/intl
if X11
Index: wesnoth/src/Makefile.in
diff -u wesnoth/src/Makefile.in:1.68 wesnoth/src/Makefile.in:1.69
--- wesnoth/src/Makefile.in:1.68 Fri Sep 3 11:29:56 2004
+++ wesnoth/src/Makefile.in Fri Sep 3 15:08:52 2004
@@ -222,6 +222,7 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FONT_FILES = @FONT_FILES@
+FULLLOCALEDIR = @FULLLOCALEDIR@
GCC_FALSE = @GCC_FALSE@
GCC_TRUE = @GCC_TRUE@
GENCAT = @GENCAT@
@@ -649,7 +650,8 @@
widgets/widget.hpp \
wesconfig.h
-AM_CXXFLAGS = @SDL_CFLAGS@ -DWESNOTH_PATH=\"$(pkgdatadir)\"
-DLOCALEDIR=\"$(localedir)\" \
+AM_CXXFLAGS = @SDL_CFLAGS@ -DWESNOTH_PATH=\"$(pkgdatadir)\" \
+ -DLOCALEDIR=\"$(LOCALEDIR)\" -DFULLLOCALEDIR=\"$(FULLLOCALEDIR)\" \
-I../intl -I$(top_srcdir)/intl
CXXLD = $(LDPREFIX) $(CXX)
Index: wesnoth/src/filesystem.cpp
diff -u wesnoth/src/filesystem.cpp:1.38 wesnoth/src/filesystem.cpp:1.39
--- wesnoth/src/filesystem.cpp:1.38 Thu Aug 26 11:51:25 2004
+++ wesnoth/src/filesystem.cpp Fri Sep 3 15:08:52 2004
@@ -1,4 +1,4 @@
-/* $Id: filesystem.cpp,v 1.38 2004/08/26 11:51:25 isaaccp Exp $ */
+/* $Id: filesystem.cpp,v 1.39 2004/09/03 15:08:52 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -183,12 +183,17 @@
std::string get_intl_dir()
{
-#ifdef _WIN32
- std::string res = get_cwd() + "/po";
- return res;
-#else
- return LOCALEDIR;
+ std::string res;
+#ifdef FULLLOCALEDIR
+ if (strcmp(LOCALEDIR,FULLLOCALEDIR) != 0)
+#endif
+ res = game_config::path + "/" LOCALEDIR;
+#ifdef FULLLOCALEDIR
+ else
+ res = LOCALEDIR;
#endif
+
+ return res;
}
std::string get_dir(const std::string& dir_path)
Index: wesnoth/src/server/Makefile.in
diff -u wesnoth/src/server/Makefile.in:1.41 wesnoth/src/server/Makefile.in:1.42
--- wesnoth/src/server/Makefile.in:1.41 Fri Sep 3 11:29:56 2004
+++ wesnoth/src/server/Makefile.in Fri Sep 3 15:08:52 2004
@@ -128,6 +128,7 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FONT_FILES = @FONT_FILES@
+FULLLOCALEDIR = @FULLLOCALEDIR@
GCC_FALSE = @GCC_FALSE@
GCC_TRUE = @GCC_TRUE@
GENCAT = @GENCAT@
@@ -294,7 +295,7 @@
../log.hpp \
../network.hpp
-AM_CXXFLAGS = @SDL_CFLAGS@ -DLOCALEDIR=\"$(localedir)\"
+AM_CXXFLAGS = @SDL_CFLAGS@ -DLOCALEDIR=\"$(LOCALEDIR)\"
AM_LDFLAGS = @SDL_LIBS@ @SDL_NET_LIBS@
all: all-am
Index: wesnoth/src/tools/Makefile.in
diff -u wesnoth/src/tools/Makefile.in:1.39 wesnoth/src/tools/Makefile.in:1.40
--- wesnoth/src/tools/Makefile.in:1.39 Fri Sep 3 11:29:56 2004
+++ wesnoth/src/tools/Makefile.in Fri Sep 3 15:08:52 2004
@@ -169,6 +169,7 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FONT_FILES = @FONT_FILES@
+FULLLOCALEDIR = @FULLLOCALEDIR@
GCC_FALSE = @GCC_FALSE@
GCC_TRUE = @GCC_TRUE@
GENCAT = @GENCAT@
@@ -307,13 +308,12 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-localedir = $(datadir)/locale
#############################################################################
# Translation Tools #
#############################################################################
AM_CXXFLAGS = @SDL_CFLAGS@ -DWESNOTH_PATH=\"$(pkgdatadir)\" -I../ \
- -DLOCALEDIR=\"$(localedir)\"
+ -DLOCALEDIR=\"$(LOCALEDIR)\"
AM_LDFLAGS = @SDL_LIBS@
Index: wesnoth/src/zip/Makefile.in
diff -u wesnoth/src/zip/Makefile.in:1.24 wesnoth/src/zip/Makefile.in:1.25
--- wesnoth/src/zip/Makefile.in:1.24 Fri Sep 3 11:29:56 2004
+++ wesnoth/src/zip/Makefile.in Fri Sep 3 15:08:53 2004
@@ -124,6 +124,7 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FONT_FILES = @FONT_FILES@
+FULLLOCALEDIR = @FULLLOCALEDIR@
GCC_FALSE = @GCC_FALSE@
GCC_TRUE = @GCC_TRUE@
GENCAT = @GENCAT@