From 15764cae98380e0223d6ecb01e86b0abe2e04ded Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Fri, 14 Mar 2008 11:06:53 +0000
Subject: (update_n_merge) split it out of (merge) ; now (merge) only update po
 w/o updating main pot file

---
 po/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'po/Makefile')

diff --git a/po/Makefile b/po/Makefile
index cf94c58..f679b1a 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -12,10 +12,12 @@ all: $(NAME).pot $(POFILES) $(MOFILES)
 %.mo: %.po
 	msgfmt -o $@ $<
 
-merge: $(NAME).pot
+update_n_merge: $(NAME).pot merge
+
+merge:
 	@for n in $(MERGE_POFILES); do \
 		echo "Merging $$n"; \
-		msgmerge "$$n" $< > "$$n"t; \
+		msgmerge "$$n" $(NAME).pot > "$$n"t; \
 		mv -f "$$n"t "$$n"; \
 	done
 
-- 
cgit v1.2.1