From 904d515dc422d3322ce192b89ae0198a7dd2f261 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Tue, 14 Feb 2006 12:24:55 +0000 Subject: [PATCH] merging po files disabled --- po/Makefile.in.in | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 7d64098..3582049 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -351,21 +351,21 @@ update-po: Makefile test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ cd $(srcdir); \ - if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \ - if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ - rm -f $$tmpdir/$$lang.new.po; \ - else \ - if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ - :; \ - else \ - echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ - exit 1; \ - fi; \ - fi; \ - else \ - echo "msgmerge for $$lang.po failed!" 1>&2; \ - rm -f $$tmpdir/$$lang.new.po; \ - fi +# if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \ +# if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ +# rm -f $$tmpdir/$$lang.new.po; \ +# else \ +# if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ +# :; \ +# else \ +# echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ +# exit 1; \ +# fi; \ +# fi; \ +# else \ +# echo "msgmerge for $$lang.po failed!" 1>&2; \ +# rm -f $$tmpdir/$$lang.new.po; \ +# fi $(DUMMYPOFILES): -- 2.7.4