On 04/23/2015 11:26 AM, Ben McGinnes wrote: > Cool. Since 2.1 is on a one month cycle, I might just wait for 2.1.4 > and try again, that'll give me the changes made from 2.1.3 and not > trying to make a release equivalent tarball from the current repo > (although if there's a script for that I might do it later today).
In my theory (which might be wrong), the scenario is like this: (1) A developer has his own [email protected] for his working directory. (2) Werner periodically does POT and PO update (usually before the release) to the repository. (3) A developer pull from the repository. (4) When a developer invokes 'make', it tries to update [email protected] by msgmerge (although we have a special rule in Rules-quot). Then, updated [email protected] may have fuzzy entries. If this is correct, I think that following patch fixes the problem. diff --git a/po/Makefile.in.in b/po/Makefile.in.in index eb68ea2..4f2849a 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -56,8 +56,7 @@ XGETTEXT_ = @XGETTEXT@ XGETTEXT_no = @XGETTEXT@ XGETTEXT_yes = @XGETTEXT_015@ XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT)) -MSGMERGE = msgmerge --previous -MSGMERGE_UPDATE = @MSGMERGE@ --previous --update +MSGMERGE = @MSGMERGE@ --previous MSGINIT = msginit MSGCONV = msgconv MSGFILTER = msgfilter @@ -192,9 +191,7 @@ $(srcdir)/$(DOMAIN).pot: $(POFILES): $(srcdir)/$(DOMAIN).pot @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ if test -f "$(srcdir)/$${lang}.po"; then \ - test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ - cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \ + $(MAKE) $${lang}.po-update; \ else \ $(MAKE) $${lang}.po-create; \ fi -- _______________________________________________ Gnupg-users mailing list [email protected] http://lists.gnupg.org/mailman/listinfo/gnupg-users
