po: Make it possible to pass custom options to msginit

* Makevars (MSGINIT_OPTIONS): New variable.
* Rules-quot: Use it when invoking msginit.
If one wants to use '--no-wrap' in MSGMERGE_OPTIONS and
XGETTEXT_OPTIONS, there should be a way to pass the option to
msginit.  Reported by Ludovic Courtès in:
<https://lists.gnu.org/archive/html/bug-gettext/2014-08/msg00004.html>.

diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog
index 31a69f8f0559fef7e63362753be57ad1afecde47..e800515413db50ad98181b5ef2c65c70614160f3 100644 (file)
--- a/gettext-runtime/po/ChangeLog
+++ b/gettext-runtime/po/ChangeLog
@@ -1,3 +1,12 @@
+2014-10-08  Daiki Ueno  <ueno@gnu.org>
+
+       * Makevars (MSGINIT_OPTIONS): New variable.
+       * Rules-quot: Use it when invoking msginit.
+       If one wants to use '--no-wrap' in MSGMERGE_OPTIONS and
+       XGETTEXT_OPTIONS, there should be a way to pass the option to
+       msginit.  Reported by Ludovic Courtès in:
+       <https://lists.gnu.org/archive/html/bug-gettext/2014-08/msg00004.html>.
+
 2014-07-14  Daiki Ueno  <ueno@gnu.org>
 
        * gettext 0.19.2 released.

diff --git a/gettext-runtime/po/Makevars b/gettext-runtime/po/Makevars
index 3b19fe406fcd99d862beff4876d39967a4c5c010..249356a6ef0a53e7df824ec535740d5b5f917b79 100644 (file)
--- a/gettext-runtime/po/Makevars
+++ b/gettext-runtime/po/Makevars
@@ -62,6 +62,12 @@ USE_MSGCTXT = no
 #   --quiet               to reduce the verbosity.
 MSGMERGE_OPTIONS =
 
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
 # This tells whether or not to regenerate a PO file when $(DOMAIN).pot
 # has changed.  Possible values are "yes" and "no".  Set this to no if
 # the POT file is checked in the repository and the version control

diff --git a/gettext-runtime/po/Rules-quot b/gettext-runtime/po/Rules-quot
index 7b92c7e45665c3343672097191946a503b894191..9dc963076f1c058e2b857e86c201b42ae06d793d 100644 (file)
--- a/gettext-runtime/po/Rules-quot
+++ b/gettext-runtime/po/Rules-quot
@@ -21,7 +21,7 @@ en@boldquot.po-update: en@boldquot.po-update-en
        ll=`echo $$lang | sed -e 's/@.*//'`; \
        LC_ALL=C; export LC_ALL; \
        cd $(srcdir); \
-       if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \
+       if $(MSGINIT) $(MSGINIT_OPTIONS) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \
           | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \
           { case `$(MSGFILTER) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
             '' | 0.[0-9] | 0.[0-9].* | 0.1[0-8] | 0.1[0-8].*) \

diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog
index a43833e32a196261f429087e80a96c074ef465ce..37563eba477dca9f0e50cce05af86e7ffefda0f1 100644 (file)
--- a/gettext-tools/po/ChangeLog
+++ b/gettext-tools/po/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-08  Daiki Ueno  <ueno@gnu.org>
+
+       * Makevars (MSGINIT_OPTIONS): New variable.
+       * Makevars.template (MSGINIT_OPTIONS): Likewise.
+
 2014-07-14  Daiki Ueno  <ueno@gnu.org>
 
        * gettext 0.19.2 released.

diff --git a/gettext-tools/po/Makevars b/gettext-tools/po/Makevars
index 8535f183e1618f450a860e0b4563362a74ab74a1..91fb749287ee6c5d464743da33289173e83f7ae4 100644 (file)
--- a/gettext-tools/po/Makevars
+++ b/gettext-tools/po/Makevars
@@ -66,6 +66,12 @@ USE_MSGCTXT = no
 #   --quiet               to reduce the verbosity.
 MSGMERGE_OPTIONS =
 
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
 # This tells whether or not to regenerate a PO file when $(DOMAIN).pot
 # has changed.  Possible values are "yes" and "no".  Set this to no if
 # the POT file is checked in the repository and the version control

diff --git a/gettext-tools/po/Makevars.template b/gettext-tools/po/Makevars.template
index fd76ad6ef6405a4ed89531166e796716636ad27f..0648ec7590d9041e9dcad38fc44904a33322f5c9 100644 (file)
--- a/gettext-tools/po/Makevars.template
+++ b/gettext-tools/po/Makevars.template
@@ -59,6 +59,12 @@ USE_MSGCTXT = no
 #   --quiet               to reduce the verbosity.
 MSGMERGE_OPTIONS =
 
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
 # This tells whether or not to regenerate a PO file when $(DOMAIN).pot
 # has changed.  Possible values are "yes" and "no".  Set this to no if
 # the POT file is checked in the repository and the version control