diff options
| author | Jim Meyering <jim@meyering.net> | 1996-03-30 12:19:38 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1996-03-30 12:19:38 +0000 |
| commit | 45479ef311f92216abc057331f21a071d6407e26 (patch) | |
| tree | 90de681d0086c6af5ba2856be110cb2b5841f9a3 /po | |
| parent | 21fb4595e685c31c593fcb378a5f9e7b9cdea88c (diff) | |
| download | coreutils-45479ef311f92216abc057331f21a071d6407e26.tar.xz | |
Upgrade from gettext-0.10.10.
Diffstat (limited to 'po')
| -rw-r--r-- | po/Makefile.in.in | 8 |
1 files 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; \ |