2010-01-28 Colin Watson <cjwatson@ubuntu.com>

	* util/grub.d/10_linux.in: This script does not use any of the
	contents of gettext.sh, only the external command `gettext', so stop
	sourcing it.  (Moreover, gettext.sh isn't necessarily installed in
	the same prefix as GRUB.)
	* util/grub.d/10_kfreebsd.in: Likewise.

diff --git a/ChangeLog b/ChangeLog
index a7f995e299884d28dad5f6c95fac3f6998f29c4a..59e46f12455de06753b4ed3dd6ff4af79c182a52 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-28  Colin Watson  <cjwatson@ubuntu.com>
+
+       * util/grub.d/10_linux.in: This script does not use any of the
+       contents of gettext.sh, only the external command `gettext', so stop
+       sourcing it.  (Moreover, gettext.sh isn't necessarily installed in
+       the same prefix as GRUB.)
+       * util/grub.d/10_kfreebsd.in: Likewise.
+
 2010-01-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * normal/cmdline.c (grub_cmdline_get): Fix completion in the middle

diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index b84b90a33296b4a3b1bfcbc1232edee2817bbf70..62d2fe321553b5d8a14c133899d3544a0ada21ac 100644 (file)
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -22,7 +22,6 @@ bindir=@bindir@
 libdir=@libdir@
 . ${libdir}/grub/grub-mkconfig_lib
 
-. ${bindir}/gettext.sh
 export TEXTDOMAIN=@PACKAGE@
 export TEXTDOMAINDIR=@localedir@
 

diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 90a6e83e73de6be014e532c38ea9b7baa9b8f313..b1c75a25bd2169381a2feaf8e56eb930fd98fa19 100644 (file)
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -22,7 +22,6 @@ bindir=@bindir@
 libdir=@libdir@
 . ${libdir}/grub/grub-mkconfig_lib
 
-. ${bindir}/gettext.sh
 export TEXTDOMAIN=@PACKAGE@
 export TEXTDOMAINDIR=@localedir@