From 29a6b9e8fadf353862ea4a579e5753fa2ddfc0b3 Mon Sep 17 00:00:00 2001
From: proski <proski@localhost>
Date: Sat, 8 Aug 2009 04:28:12 +0000
Subject: [PATCH] 2009-08-08  Pavel Roskin  <proski@gnu.org>

	* util/grub-mkconfig.in: Define datarootdir, datadir may depend
	on it.  Add missing space before closing bracket.  Fix
	misleading formatting.
---
 ChangeLog             |  6 ++++++
 util/grub-mkconfig.in | 11 ++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a47abd4a3..1c8a14664 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-08  Pavel Roskin  <proski@gnu.org>
+
+	* util/grub-mkconfig.in: Define datarootdir, datadir may depend
+	on it.  Add missing space before closing bracket.  Fix
+	misleading formatting.
+
 2009-08-07  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* docs/grub.texi: Major overhaul.  Remove all sections that are
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 4ddb7beae..7756b492a 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -24,6 +24,7 @@ sbindir=@sbindir@
 libdir=@libdir@
 sysconfdir=@sysconfdir@
 package_version=@PACKAGE_VERSION@
+datarootdir=@datarootdir@
 datadir=@datadir@
 pkgdatadir=${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`
 grub_prefix=`echo /boot/grub | sed ${transform}`
@@ -161,17 +162,17 @@ case ${GRUB_TERMINAL_OUTPUT} in
 	else
 	  continue
 	fi
-	if [ "${basename}" = "ascii"] ; then
+	if [ "${basename}" = "ascii" ] ; then
 	  # make sure all our children behave in conformance with ascii..
 	  export LANG=C
 	fi
 	break 2
       done
     done
-      if [ -z "${GRUB_FONT_PATH}" ] ; then
-        # fallback to the native terminal for this platform
-        unset GRUB_TERMINAL_OUTPUT
-      fi
+    if [ -z "${GRUB_FONT_PATH}" ] ; then
+      # fallback to the native terminal for this platform
+      unset GRUB_TERMINAL_OUTPUT
+    fi
   ;;
   *)
     # make sure all our children behave in conformance with ascii..