From e96fc2385bf70c8f3d647043f67a2d97a109e078 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Fri, 14 Mar 2008 10:41:07 +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(-)

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
 
-- 
cgit v1.2.1