summaryrefslogtreecommitdiff
path: root/po/Makevars
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2019-07-31 17:00:58 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2019-07-31 17:00:58 +0200
commitd087d778ffb62e2713cb848540bcc819470365bd (patch)
treed69692a274dd1c7d0672e6bb7155a0fc106f9d49 /po/Makevars
parentc8bd2513ecba169cff44c09c8058c36987357b18 (diff)
parent3759ce55ba79b8d3b9d8ed247a252273ee7dade3 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'po/Makevars')
-rw-r--r--po/Makevars18
1 files changed, 11 insertions, 7 deletions
diff --git a/po/Makevars b/po/Makevars
index bb5d203..ebff23f 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -1,5 +1,5 @@
# Makevars -- snippet for inclusion in po/ -*- Makefile -*-
-# Copyright (C) 2016 Olaf Meeuwissen and the SANE developers
+# Copyright (C) 2016, 2019 Olaf Meeuwissen and the SANE developers
#
# This file is part of the SANE build infra-structure. See the
# included LICENSE file for license information.
@@ -32,14 +32,18 @@ subdir = po
# Options to pass to xgettext and other gettext utilities.
# Additional options may also by specified using AM_XGETTEXT_OPTION
# in `$(top_srcdir)/configure.ac`. See Makefile.in.in and Rules-*
-# for variables available
-XGETTEXT_OPTIONS = --keyword=SANE_I18N
+# for variables available.
+XGETTEXT_OPTIONS = $(width_options)
+XGETTEXT_OPTIONS += --keyword=SANE_I18N
XGETTEXT_OPTIONS += --flag=SANE_I18N:1:no-c-format
-MSGMERGE_OPTIONS = --width=75
+MSGMERGE_OPTIONS = $(width_options)
+MSGINIT_OPTIONS = $(width_options)
+MSGCONV_OPTIONS = $(width_options)
+MSGFILTER_OPTIONS = $(width_options)
+# All gettext related utilities need to use the same width value in
+# order to pass a `make distcheck`.
+width_options = --width=75
# Locale categories, in addition to LC_MESSAGES, for which message
# catalogs are to be used.
EXTRA_LOCALE_CATEGORIES =
-
-EXTRA_DIST = README
-EXTRA_DIST += Rules-automake