diff options
| author | Daiki Ueno <ueno@gnu.org> | 2014-10-08 15:17:08 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2014-10-08 15:24:02 +0900 |
| commit | 5fd79b0faac8d3382ae0e09c068249abb3ec3a8f (patch) | |
| tree | 4566f3bce0ce731af27aa97b230727c4b186855c /gettext-runtime | |
| parent | fa8e859254eac21d8742b47a55b31f67c267a6c8 (diff) | |
| download | external_gettext-5fd79b0faac8d3382ae0e09c068249abb3ec3a8f.zip external_gettext-5fd79b0faac8d3382ae0e09c068249abb3ec3a8f.tar.gz external_gettext-5fd79b0faac8d3382ae0e09c068249abb3ec3a8f.tar.bz2 | |
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>.
Diffstat (limited to 'gettext-runtime')
| -rw-r--r-- | gettext-runtime/po/ChangeLog | 9 | ||||
| -rw-r--r-- | gettext-runtime/po/Makevars | 6 | ||||
| -rw-r--r-- | gettext-runtime/po/Rules-quot | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog index 31a69f8..e800515 100644 --- 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 3b19fe4..249356a 100644 --- 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 7b92c7e..9dc9630 100644 --- 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].*) \ |