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

---
 po/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'po')

diff --git a/po/Makefile b/po/Makefile
index 69f6746c..e06cb91a 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -43,7 +43,9 @@ $(PGOAL).pot: $(PL_FILES) POTFILES.in
 	msgcat --use-first $(PGOAL)_tmp.pot desktopstuff.pot > $@
 	rm -f desktopstuff.pot $(PGOAL)_tmp.pot
 
-merge: $(PGOAL).pot
+update_n_merge: $(PGOAL).pot merge
+
+merge:
 	@for n in $(POFILES); do \
 		echo "Merging $$n"; \
 		msgmerge -C "$$n" "$$n" $(PGOAL).pot > "$$n"t; \
-- 
cgit v1.2.1