From 3661bf4880dea683268c973962238f4196bd7118 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 10 Dec 2002 01:56:26 +0000
Subject: use "perl_checker --generate-pot" instead of fake_c + xgettext

---
 perl-install/share/po/Makefile  | 10 ++--------
 perl-install/share/po/fake_c.pl | 22 ----------------------
 2 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100755 perl-install/share/po/fake_c.pl

diff --git a/perl-install/share/po/Makefile b/perl-install/share/po/Makefile
index c853263c5..4088668cb 100644
--- a/perl-install/share/po/Makefile
+++ b/perl-install/share/po/Makefile
@@ -1,7 +1,6 @@
 include ../../Makefile.config
 
 PMSFILES = $(wildcard $(ALLPMS:%=../../%))
-PMSCFILES = $(PMSFILES:%=%_.c)
 
 # temporarly don't include those po files
 # (too low translation percentage)
@@ -30,18 +29,13 @@ help:
 %.mo: %.po
 	msgfmt -o $@ $<
 
-$(PMSCFILES): %_.c: %
-	./fake_c.pl $< > $@
-
 $(POFILES): DrakX.pot
 	perl -ne 'print unless /^# DO NOT BOTHER TO MODIFY HERE, SEE:|^#.*\Qdrakx-help.xml/ .. /^$$/' $@ > $@t
 	if [ -e help-$@t ]; then perl -pe 's|^#~ ||' -i $@t ; msgmerge -C $@t help-$@t $< > $@; else msgmerge $@t $< > $@; fi
 	rm $@t
 
 DrakX.pot: $(PMSFILES)
-	$(MAKE) $(PMSCFILES);
-	xgettext -F -n --add-comments='-PO' --keyword=N --keyword=N_ -o $@ $(PMSCFILES)
-	rm $(PMSCFILES)
+	perl_checker -q --generate-pot $@ $(PMSFILES)
 	perl i18n_compssUsers 2>/dev/null >> $@
 
 install:
@@ -51,7 +45,7 @@ install:
 	done
 
 clean:
-	@rm -rf drakx-help.xml .memdump doc empty.po tmp.* messages tmp.pot *.mo $(POFILES:%=%t) $(PMSCFILES)
+	@rm -rf drakx-help.xml .memdump doc empty.po tmp.* messages tmp.pot *.mo $(POFILES:%=%t)
 
 check:
 	@grep -F '$$' DrakX.pot && { echo "bad translation strings (contains \$$) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"; exit 1; } ||:
diff --git a/perl-install/share/po/fake_c.pl b/perl-install/share/po/fake_c.pl
deleted file mode 100755
index cd80801eb..000000000
--- a/perl-install/share/po/fake_c.pl
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/perl -lp
-
-s|^(N_?\()| $1|;		# add a blank at the beginning (?!)
-
-s|N\(\[(.*),\s*(.*),\s*(.*)\]|ngettext($2,$3,$1)|; # special plural form handling
-
-s,\Qs/#.*//,,;			# ugly special case
-
-s,(^|[^\$])#([^+].*),"$1/*" . simpl($2) . "*/",e; 
-                                # rewrite comments to C format except for:
-                                # - ``#+ xxx'' comments which are kept
-                                # - ``$#xxx'' which are not comments
-
-s|//|/""/|g;			# ensure // or not understood as comments
-
-s|$|\\n\\|;			# multi-line strings not handled in C
-
-sub simpl {
-    local $_ = $_[0];
-    s,\*/,,g;
-    $_;
-}
-- 
cgit v1.2.1