summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-03-14 10:41:07 +0000
committerThierry Vignaud <tv@mandriva.org>2008-03-14 10:41:07 +0000
commite96fc2385bf70c8f3d647043f67a2d97a109e078 (patch)
treec9d54ced86e82f92eeafeb4ca523e2035c078cf9
parentddf0d19cf19fdbcedf5bf2f022f22175981920cb (diff)
downloadmgaonline-e96fc2385bf70c8f3d647043f67a2d97a109e078.tar
mgaonline-e96fc2385bf70c8f3d647043f67a2d97a109e078.tar.gz
mgaonline-e96fc2385bf70c8f3d647043f67a2d97a109e078.tar.bz2
mgaonline-e96fc2385bf70c8f3d647043f67a2d97a109e078.tar.xz
mgaonline-e96fc2385bf70c8f3d647043f67a2d97a109e078.zip
(update_n_merge) split it out of (merge) ; now (merge) only update po w/o updating main pot file
-rw-r--r--po/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/po/Makefile b/po/Makefile
index e1d185e0..1ed7b9fe 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -30,10 +30,12 @@ clean:
$(PGOAL).pot: $(PL_FILES) $(CFILES)
perl_checker -q --generate-pot $(PGOAL).pot $(PL_FILES)
-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