From: Felix Zielcke <fzielcke@z-51.de>
Date: Sat, 21 Nov 2009 14:49:21 +0000 (+0100)
Subject: Merge trunk
X-Git-Tag: 1.98~391
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=97951fb23200dad7b40f09ca24bcb49f6c6a82dd;p=thirdparty%2Fgrub.git

Merge trunk
---

97951fb23200dad7b40f09ca24bcb49f6c6a82dd
diff --cc ChangeLog
index 345ea8ae2,42ab8b8b6..868fd5c13
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,20 +1,26 @@@
 +2009-11-21  Felix Zielcke  <fzielcke@z-51.de>
 +
 +	Patch from Loïc Minier <loic.minier@ubuntu.com>.
 +	* util/grub.d/30_os-prober.in: Cope with Linux entries where
 +	root and /boot are on different devices.
 +
+ 2009-11-21  Robert Millan  <rmh.grub@aybabtu.com>
+ 
+ 	Fix build for srcdir != objdir.
+ 
+ 	* Makefile.in (po/$(PACKAGE).pot): Rename to ...
+ 	($(srcdir)/po/$(PACKAGE).pot): ... this.  Run $(XGETTEXT) from
+ 	$(srcdir).
+ 	($(foreach lang, $(LINGUAS), po/$(lang).po)): Rename to ...
+ 	($(foreach lang, $(LINGUAS), $(srcdir)/po/$(lang).po): ... this. Use $^
+ 	reference for input.
+ 
+ 2009-11-21  Robert Millan  <rmh.grub@aybabtu.com>
+ 
+ 	* util/grub-mkrescue.in: Use source directory direcly (without copiing
+ 	or hardlinking it).  Remove -J option, Joliet is not compatible with
+ 	multiple source directories.
+ 
  2009-11-21  Carles Pina i Estany <carles@pina.cat>
  2009-11-21  Robert Millan  <rmh.grub@aybabtu.com>