Alexandre Julliard : configure: Automatically remove obsolete entries in po files.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 945ccf52e9baa9daaf88fd63016a977982ffca19
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=945ccf52e9baa9daaf88fd6301...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Thu Jan 27 15:09:55 2011 +0100

configure: Automatically remove obsolete entries in po files.

---

 configure    |    2 +-
 configure.ac |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index a3b5ad9..013dc0b 100755
--- a/configure
+++ b/configure
@@ -15491,7 +15491,7 @@ then
 ALL_POT_FILES =$ALL_POT_FILES
 all: \$(ALL_PO_FILES)
 \$(ALL_PO_FILES): \$(srcdir)/po/wine.pot
-	msgmerge -U -q --backup=none \$@ \$(srcdir)/po/wine.pot && touch \$@
+	msgmerge -q \$@ \$(srcdir)/po/wine.pot | msgattrib --no-obsolete -o \$@.new && mv \$@.new \$@
 \$(srcdir)/po/wine.pot: \$(ALL_POT_FILES)
 	msgcat -o \$@ \$(ALL_POT_FILES)"
 fi
diff --git a/configure.ac b/configure.ac
index a7a1339..277bd8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3009,7 +3009,7 @@ then
 ALL_POT_FILES =$ALL_POT_FILES
 all: \$(ALL_PO_FILES)
 \$(ALL_PO_FILES): \$(srcdir)/po/wine.pot
-	msgmerge -U -q --backup=none \$[@] \$(srcdir)/po/wine.pot && touch \$[@]
+	msgmerge -q \$[@] \$(srcdir)/po/wine.pot | msgattrib --no-obsolete -o \$[@].new && mv \$[@].new \$[@]
 \$(srcdir)/po/wine.pot: \$(ALL_POT_FILES)
 	msgcat -o \$[@] \$(ALL_POT_FILES)])
 fi