Merge mainline into pci
This commit is contained in:
commit
a21400a563
2 changed files with 8 additions and 1 deletions
|
@ -1,3 +1,10 @@
|
|||
2009-11-30 Robert Millan <rmh.grub@aybabtu.com>
|
||||
|
||||
Fix $srcdir != $objdir build.
|
||||
|
||||
* Makefile.in (po/%.po): Rewrite as ...
|
||||
($(foreach lang, $(LINGUAS), $(srcdir)/po/$(lang).po)): ... this.
|
||||
|
||||
2009-11-29 Samuel Thibault <samuel.thibault@ens-lyon.org>
|
||||
|
||||
Fix GNU/Hurd grub-install crash.
|
||||
|
|
|
@ -482,7 +482,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
|
||||
|
||||
po/%.po: po/$(PACKAGE).pot
|
||||
$(foreach lang, $(LINGUAS), $(srcdir)/po/$(lang).po): po/$(PACKAGE).pot
|
||||
$(MSGMERGE) -U $@ $^
|
||||
|
||||
po/%.mo: po/%.po
|
||||
|
|
Loading…
Reference in a new issue