diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2008-03-14 10:34:56 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2008-03-14 10:34:56 +0000 |
| commit | 976b9dd2e85c2aa0af24dcdd8d12c1cf094ae3f7 (patch) | |
| tree | 1d209bb4239b233085864ea71a979c6deef13508 /po/Makefile | |
| parent | f3730819c4dd52fe986e294dd1a93e863402967a (diff) | |
| download | userdrake-976b9dd2e85c2aa0af24dcdd8d12c1cf094ae3f7.tar userdrake-976b9dd2e85c2aa0af24dcdd8d12c1cf094ae3f7.tar.gz userdrake-976b9dd2e85c2aa0af24dcdd8d12c1cf094ae3f7.tar.bz2 userdrake-976b9dd2e85c2aa0af24dcdd8d12c1cf094ae3f7.tar.xz userdrake-976b9dd2e85c2aa0af24dcdd8d12c1cf094ae3f7.zip | |
(update_n_merge) split it out of (merge) ; now (merge) only update po w/o updating main pot file
Diffstat (limited to 'po/Makefile')
| -rw-r--r-- | po/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/po/Makefile b/po/Makefile index 5fca51f..f9d5721 100644 --- a/po/Makefile +++ b/po/Makefile @@ -38,10 +38,12 @@ $(PGOAL).pot: POTFILES.in $(PL_FILES) $(CFILES) [ ! -e $(PGOAL)_tmp.pot ] || msgcat --use-first placeholder.pot $(PGOAL)_tmp.pot > $@ rm -f placeholder.pot $(PGOAL)_tmp.pot -merge: $(PGOAL).pot +update_n_merge: $(PGOAL).pot merge + +merge: @for n in $(POFILES); do \ echo "Merging $$n"; \ - msgmerge "$$n" $< > "$$n"t; \ + msgmerge "$$n" $(PGOAL).pot > "$$n"t; \ mv -f "$$n"t "$$n"; \ done |