Author: cazfi
Date: Mon Jan  5 18:46:11 2015
New Revision: 27538

URL: http://svn.gna.org/viewcvs/freeciv?rev=27538&view=rev
Log:
Replaced configure Makefile modifying hack to add "--language=C" xgettext 
parameter
with introduction of the parameter in Makevars.

See patch #5646

Modified:
    branches/S2_6/configure.ac
    branches/S2_6/translations/freeciv/Makevars
    branches/S2_6/translations/nations/Makevars
    branches/S2_6/translations/ruledit/Makevars

Modified: branches/S2_6/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/configure.ac?rev=27538&r1=27537&r2=27538&view=diff
==============================================================================
--- branches/S2_6/configure.ac  (original)
+++ branches/S2_6/configure.ac  Mon Jan  5 18:46:11 2015
@@ -1304,22 +1304,6 @@
 TOLUA_LIBS="\$(top_builddir)/dependencies/tolua-5.2/src/lib/libtolua.la"
 AC_SUBST([TOLUA_CFLAGS])
 AC_SUBST([TOLUA_LIBS])
-
-dnl Vast quantities of meaningless errors from xgettext is also annoying.
-dnl We fix this by forcing xgettext to assume all files are C source files.
-AC_CONFIG_COMMANDS([fc_default-2],[[for domain in $PODOMAINS ; do
-   if test -f translations/freeciv/Makefile ; then
-     if grep 'language=C --files-from=\$(srcdir)/POTFILES.in' 
translations/${domain}/Makefile >/dev/null 2>&1 ; then
-       # has already been silenced
-       :
-     else
-       echo silencing translations/${domain}/Makefile
-       mv -f translations/${domain}/Makefile 
translations/${domain}/Makefile.tmp
-       sed -e 's/--files-from=$(srcdir)\/POTFILES.in/--language=C 
--files-from=$(srcdir)\/POTFILES.in/' translations/${domain}/Makefile.tmp > 
translations/${domain}/Makefile
-       rm translations/${domain}/Makefile.tmp
-     fi
-   fi
- done]],[PODOMAINS="$PODOMAINS"])
 
 dnl Most of the C comments copied to freeciv.pot are spurious; 
 dnl change to only copy those with prefix "TRANS:"

Modified: branches/S2_6/translations/freeciv/Makevars
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/freeciv/Makevars?rev=27538&r1=27537&r2=27538&view=diff
==============================================================================
--- branches/S2_6/translations/freeciv/Makevars (original)
+++ branches/S2_6/translations/freeciv/Makevars Mon Jan  5 18:46:11 2015
@@ -12,7 +12,8 @@
   --keyword=_ --flag=_:1:pass-c-format \
   --keyword=N_ --flag=N_:1:pass-c-format \
   --keyword=--keyword=Q_ --keyword=PL_:1,2 \
-  --flag=error:3:c-format --flag=error_at_line:5:c-format
+  --flag=error:3:c-format --flag=error_at_line:5:c-format \
+  --language=C
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding

Modified: branches/S2_6/translations/nations/Makevars
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/nations/Makevars?rev=27538&r1=27537&r2=27538&view=diff
==============================================================================
--- branches/S2_6/translations/nations/Makevars (original)
+++ branches/S2_6/translations/nations/Makevars Mon Jan  5 18:46:11 2015
@@ -12,7 +12,8 @@
   --keyword=_ --flag=_:1:pass-c-format \
   --keyword=N_ --flag=N_:1:pass-c-format \
   --keyword=--keyword=Q_ --keyword=PL_:1,2 \
-  --flag=error:3:c-format --flag=error_at_line:5:c-format
+  --flag=error:3:c-format --flag=error_at_line:5:c-format \
+  --language=C
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding

Modified: branches/S2_6/translations/ruledit/Makevars
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/ruledit/Makevars?rev=27538&r1=27537&r2=27538&view=diff
==============================================================================
--- branches/S2_6/translations/ruledit/Makevars (original)
+++ branches/S2_6/translations/ruledit/Makevars Mon Jan  5 18:46:11 2015
@@ -13,7 +13,8 @@
   --keyword=N_ --flag=N_:1:pass-c-format \
   --keyword=--keyword=Q_ --keyword=PL_:1,2 \
   --keyword=R__ \
-  --flag=error:3:c-format --flag=error_at_line:5:c-format
+  --flag=error:3:c-format --flag=error_at_line:5:c-format \
+  --language=C
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to