From d39a1de83106668cf6ae28a931e99d9b22e65352 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 14 Mar 2008 11:04:23 +0000 Subject: (update_n_merge) split it out of (merge) ; now (merge) only update po w/o updating main pot file --- po/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/Makefile b/po/Makefile index ac45a33..db532c7 100644 --- a/po/Makefile +++ b/po/Makefile @@ -35,7 +35,9 @@ clean: $(PGOAL).pot: $(PL_FILES) POTFILES.in perl_checker -q --generate-pot $@ $(PL_FILES) -merge: $(PGOAL).pot +update_n_merge: $(PGOAL).pot merge + +merge: @for n in $(POFILES); do \ echo "Merging $$n"; \ msgmerge -C "$$n" "$$n" $(PGOAL).pot > "$$n"t; \ -- cgit v1.2.1