From 45479ef311f92216abc057331f21a071d6407e26 Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Sat, 30 Mar 1996 12:19:38 +0000
Subject: Upgrade from gettext-0.10.10.

---
 po/Makefile.in.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index ae15b8f3e..a51717b39 100644
--- 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; \
-- 
cgit v1.2.3-70-g09d2