From 976b9dd2e85c2aa0af24dcdd8d12c1cf094ae3f7 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Fri, 14 Mar 2008 10:34:56 +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')

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