From 163a33ac4d066fd929f1c64e1a079cd1b9b01302 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Fri, 14 Mar 2008 10:42:11 +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 1ee83130..717791b9 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -21,10 +21,12 @@ all: $(GOALS)
 %.mo: %.po
 	msgfmt -o $@ $<
 
-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