From 9ed4841d7a792cc22a180d7cec2c92df904091e6 Mon Sep 17 00:00:00 2001 From: Robert Millan Date: Fri, 27 Nov 2009 16:46:00 +0000 Subject: [PATCH] 2009-11-27 Robert Millan * Makefile.in (LINGUAS): Rewrite by scanning po/ directory instead of reliing on po/LINGUAS. ($(foreach lang, $(LINGUAS), $(srcdir)/po/$(lang).po)): Rewrite as ... (po/%.po): ... this. --- ChangeLog | 7 +++++++ Makefile.in | 4 ++-- po/ChangeLog | 4 ++++ po/LINGUAS | 3 --- 4 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 po/LINGUAS diff --git a/ChangeLog b/ChangeLog index 4c6589a5d..a21569730 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-11-27 Robert Millan + + * Makefile.in (LINGUAS): Rewrite by scanning po/ directory instead of + reliing on po/LINGUAS. + ($(foreach lang, $(LINGUAS), $(srcdir)/po/$(lang).po)): Rewrite as ... + (po/%.po): ... this. + 2009-11-26 Felix Zielcke * util/i386/efi/grub-mkimage.c: Include "progname.h". diff --git a/Makefile.in b/Makefile.in index 7678ceee0..43d220663 100644 --- a/Makefile.in +++ b/Makefile.in @@ -45,7 +45,7 @@ XGETTEXT = @XGETTEXT@ MSGMERGE = @MSGMERGE@ MSGFMT = @MSGFMT@ -LINGUAS = $(shell tr '\n' ' ' < $(srcdir)/po/LINGUAS) +LINGUAS = $(shell ls $(srcdir)/po/*.po | sed -e "s,.*/po/\(.*\)\.po$$,\1,") PACKAGE = @PACKAGE@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -478,7 +478,7 @@ $(srcdir)/po/$(PACKAGE).pot: po/POTFILES po/POTFILES-shell cd $(srcdir) && $(XGETTEXT) --from-code=utf-8 -o $@ -f $< --keyword=_ --keyword=N_ cd $(srcdir) && $(XGETTEXT) --from-code=utf-8 -o $@ -f po/POTFILES-shell -j --language=Shell -$(foreach lang, $(LINGUAS), $(srcdir)/po/$(lang).po): po/$(PACKAGE).pot +po/%.po: po/$(PACKAGE).pot $(MSGMERGE) -U $@ $^ po/%.mo: po/%.po diff --git a/po/ChangeLog b/po/ChangeLog index 6e537ccbf..4069fb315 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2009-11-27 Robert Millan + + * LINGUAS: Remove. + 2009-11-24 Robert Millan * zh_CN.po: New file. diff --git a/po/LINGUAS b/po/LINGUAS deleted file mode 100644 index 9bc3e53c1..000000000 --- a/po/LINGUAS +++ /dev/null @@ -1,3 +0,0 @@ -ca -id -zh_CN