From e3f51342a1b8446259e73e04916b6fad7cb8dc5d Mon Sep 17 00:00:00 2001
From: tv <tv@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
Date: Fri, 14 Mar 2008 10:58:10 +0000
Subject: (update_n_merge) split it out of (merge) ; now (merge) only update po
 w/o updating main pot file

git-svn-id: http://svn.mandriva.com/svn/soft/draksnapshot/trunk@239396 99302b65-d5f7-0310-b3dd-f8cd6f4e3d94
---
 po/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'po/Makefile')

diff --git a/po/Makefile b/po/Makefile
index 0e74f42..dc2a8a4 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -32,10 +32,12 @@ clean:
 $(PGOAL).pot: $(PL_FILES)
 	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