branch to build the firewall install.topic/unlabeled-1.1.1

1 files changed, 24 insertions, 15 deletions

diff --git a/perl-install/share/po/Makefile b/perl-install/share/po/Makefile
index 6743ddaf9..3f470e6f8 100644
--- a/perl-install/share/po/Makefile
+++ b/perl-install/share/po/Makefile
@@ -1,21 +1,30 @@
-PMSFILES = $(shell find .. -name "*.pm")
-POFILES = $(wildcard *.po)
-FROMPOFILES = $(POFILES:%.po=%.pm)
+include ../../Makefile.config
 
-all: $(FROMPOFILES)
+PMSFILES = $(wildcard $(PMS:%=../../%))
+PMSCFILES = $(PMSFILES:%=%_.c)
+POFILES = $(shell ls *.po)
+
+all: $(POFILES)
 
 clean:
-	rm -f $(FROMPOFILES)
+	rm -f empty.po messages $(POFILES:%=%t) $(PMSCFILES)
+
+verif:
+	perl -ne '/^\s*#/ or $$i += my @l = /\b__?\(/g; END { print "$$i\n" }' $(PMSFILES)
+	perl -ne '$$i += my @l = /\.c:/g; END { print "$$i\n" }' DrakX.pot
+
+$(POFILES): DrakX.pot
+	cp -f $@ $@t
+	msgmerge $@t $< > $@
+	rm $@t
 
-$(FROMPOFILES): %.pm: %.po
-	./po2perl < $< > $@
+DrakX.pot: $(PMSFILES)
+	$(MAKE) $(PMSCFILES);
+	xgettext -F -n --add-comments='-PO' --keyword=_ --keyword=__ -o $@ $(PMSCFILES)
+	rm $(PMSCFILES)
+	perl i18n_compssUsers 2>/dev/null >> $@
 
-%.po: $(PMSFILES)
-	touch $@
-	for i in $(PMSFILES); do \
-		sed -e 's/#\(.*\)/\/*\1*\//' -e 's/$$/\\n\\/' < $$i > $${i}c; \
-		xgettext -j -F -Lc -n --omit-header --keyword=_ --keyword=__ -o $@ $${i}c; \
-		rm $${i}c; \
-	done
+$(PMSCFILES): %_.c: %
+	perl -pe 's|^(__?\()| $$1|; s,(^|[^\$$])#([^+].*),\1/*\2*\/,; s|$$|\\n\\|' $< > $@
 
-FORCE:
\ No newline at end of file
+#	for i in *.po; do echo -n "$i "; msgfmt -v $i 2>&1; done | perl -e 'print map { $_->[0] } sort { $a->[1] <=> $b->[1] } map { [ $_, (split)[1] ] } <>'