Upgrade from gettext-0.10.10.

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index ae15b8f3edc470b0068d31752e52a730b8886126..a51717b39e7aa2ece087f8583936fb2b4addbbd2 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -41,7 +41,7 @@ GENCAT = @GENCAT@
 GMSGFMT = @GMSGFMT@
 MSGFMT = @MSGFMT@
 XGETTEXT = @XGETTEXT@
-TUPDATE = tupdate
+MSGMERGE = msgmerge -f
 
 DEFS = @DEFS@
 CFLAGS = @CFLAGS@
@@ -71,7 +71,7 @@ INSTOBJEXT = @INSTOBJEXT@
 
 .po.pox:
        $(MAKE) $(PACKAGE).pot
-       $(TUPDATE) $(srcdir)/$(PACKAGE).pot $< > $*.pox
+       $(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
 
 .po.mo:
        $(MSGFMT) -o $@ $<
@@ -185,10 +185,10 @@ update-po: Makefile
        for cat in $$catalogs; do \
          lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
          mv $$lang.po $$lang.old.po; \
-         if $(TUPDATE) $(PACKAGE).pot $$lang.old.po > $$lang.po; then \
+         if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \
            rm -f $$lang.old.po; \
          else \
-           echo "tupdate for $$cat failed!"; \
+           echo "msgmerge for $$cat failed!"; \
            rm -f $$lang.po; \
            mv $$lang.old.po $$lang.po; \
          fi; \