Offer more choices in the Makevars template.

diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog
index 7d9d972503f556b98b59b22d4532ff3e0cc238ee..2667b20ce9b9c480b8be7450f3889f5ebf3b415e 100644 (file)
--- a/gettext-tools/po/ChangeLog
+++ b/gettext-tools/po/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-04  Bruno Haible  <bruno@clisp.org>
+
+       Offer more choices in the Makevars template.
+       * Makevars.template (USE_MSGCTXT, MSGMERGE_OPTIONS): New variables.
+
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.18.1 released.

diff --git a/gettext-tools/po/Makevars.template b/gettext-tools/po/Makevars.template
index 32692ab4b98405fcbf6a46497fba1a6c773d1b90..4a9ff7d231fb2360d341d23995d4f36d68dfc31f 100644 (file)
--- a/gettext-tools/po/Makevars.template
+++ b/gettext-tools/po/Makevars.template
@@ -39,3 +39,15 @@ MSGID_BUGS_ADDRESS =
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+#   --previous            to keep previous msgids of translated messages,
+#   --quiet               to reduce the verbosity.
+MSGMERGE_OPTIONS =