From ffeffd1cedda24f5dd9dc5f97e6ad9d0c4ad2029 Mon Sep 17 00:00:00 2001 From: Roland Illig Date: Sun, 3 Jul 2005 21:34:43 +0000 Subject: [PATCH] * Makevars: Rewrote the MSGMERGE flags selection so that the --no-location can be overridden more easily. --- po/ChangeLog | 5 +++++ po/Makevars | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/po/ChangeLog b/po/ChangeLog index bfa604e5d..14aa57569 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,8 @@ +2005-07-03 Roland Illig + + * Makevars: Rewrote the MSGMERGE flags selection so that the + --no-location can be overridden more easily. + 2005-07-03 Roland Illig * hu.po: Updated hungarian translation, provided by Arpad Biro diff --git a/po/Makevars b/po/Makevars index 84a7ca48a..f2b3b06f2 100644 --- a/po/Makevars +++ b/po/Makevars @@ -40,6 +40,7 @@ MSGID_BUGS_ADDRESS = mc-devel@gnome.org # message catalogs shall be used. It is usually empty. EXTRA_LOCALE_CATEGORIES = -# Suppress location information -MSGMERGE = msgmerge --no-location -MSGMERGE_UPDATE = msgmerge --update --no-location +# Suppress location information by default +MSGMERGE_FLAGS ?= --no-location +MSGMERGE = msgmerge ${MSGMERGE_FLAGS} +MSGMERGE_UPDATE = msgmerge --update ${MSGMERGE_FLAGS}