=== modified file 'ChangeLog'
--- ChangeLog	2010-06-03 22:23:22 +0000
+++ ChangeLog	2010-06-03 22:35:21 +0000
@@ -1,5 +1,13 @@
 2010-06-03  Grégoire Sutre  <address@hidden>
 
+	* util/grub-install.in: Remove the dependency on grub-mkconfig_lib.
+	* util/grub-mkconfig_lib.in (prepare_grub_to_access_device): Fix typo
+	in partmap module loading.
+	* util/grub.d/00_header.in: Check for non-empty LANG in locale support.
+	* util/grub.d/10_netbsd.in: Added a comment.
+
+2010-06-03  Grégoire Sutre  <address@hidden>
+
 	* Makefile.in (install-local): Apply file name transformations to
 	generated locale (*.mo) files.
 	* util/grub-install.in: Likewise.

=== modified file 'util/grub-install.in'
--- util/grub-install.in	2010-06-03 22:23:22 +0000
+++ util/grub-install.in	2010-06-03 22:35:21 +0000
@@ -41,6 +41,7 @@ self=`basename $0`
 grub_setup=${sbindir}/`echo grub-setup | sed ${transform}`
 grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
 grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
+grub_mkrelpath=${bindir}/`echo grub-mkrelpath | sed ${transform}`
 grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
 grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}`
 grub_mofile=`echo ${PACKAGE}.mo | sed ${transform}`
@@ -154,9 +155,6 @@ for option in "$@"; do
     esac
 done
 
-# for make_system_path_relative_to_its_root()
-. ${pkglibrootdir}/grub-mkconfig_lib
-
 if test "x$install_device" = x && test "${target_cpu}-${platform}" != "mips-yeeloong"; then
     echo "install_device not specified." 1>&2
     usage
@@ -187,7 +185,7 @@ if [ "${target_cpu}-${platform}" = "i386
     fi
 fi
 
-for prog in mkimage mkdevicemap probe; do
+for prog in mkimage mkdevicemap mkrelpath probe; do
     eval set \$grub_$prog dummy
     if test -x "$1"; then
         :
@@ -278,7 +276,7 @@ devabstraction_module=`$grub_probe --tar
 modules="$modules $disk_module"
 modules="$modules $fs_module $partmap_module $devabstraction_module"
 
-relative_grubdir=`make_system_path_relative_to_its_root ${grubdir}` || exit 1
+relative_grubdir=`$grub_mkrelpath ${grubdir}` || exit 1
 if [ "x${relative_grubdir}" = "x" ] ; then
     relative_grubdir=/
 fi

=== modified file 'util/grub-mkconfig_lib.in'
--- util/grub-mkconfig_lib.in	2010-06-03 21:36:19 +0000
+++ util/grub-mkconfig_lib.in	2010-06-03 22:35:21 +0000
@@ -114,7 +114,7 @@ prepare_grub_to_access_device ()
 
   partmap="`${grub_probe} --device ${device} --target=partmap`"
   for module in ${partmap} ; do
-    echo "insmod ${module}"
+    echo "insmod part_${module}"
   done
 
   fs="`${grub_probe} --device ${device} --target=fs`"

=== modified file 'util/grub.d/00_header.in'
--- util/grub.d/00_header.in	2010-06-03 21:36:19 +0000
+++ util/grub.d/00_header.in	2010-06-03 22:35:21 +0000
@@ -195,7 +195,7 @@ EOF
 esac
 
 # Gettext variables and module
-if [ "x${LANG}" != "xC" ] && [ -d "${locale_dir}" ] ; then
+if [ "x${LANG}" != "x" ] && [ "x${LANG}" != "xC" ] && [ -d "${locale_dir}" ] ; then
     prepare_grub_to_access_device $(${grub_probe} --target=device ${locale_dir})
   cat << EOF
 set locale_dir=(\$root)$(make_system_path_relative_to_its_root ${locale_dir})

=== modified file 'util/grub.d/10_netbsd.in'
--- util/grub.d/10_netbsd.in	2010-06-03 21:36:19 +0000
+++ util/grub.d/10_netbsd.in	2010-06-03 22:35:21 +0000
@@ -62,6 +62,7 @@ netbsd_entry ()
   printf "}\n"
 }
 
+# Cache the sequence of commands to access / (whose device is ${GRUB_DEVICE}).
 prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e 's,^,	,')"
 
 # We look for NetBSD kernels in / but not in subdirectories.  We simply