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.

diff --git a/ChangeLog b/ChangeLog
index a47abd4a315906e20ccbca193c32fd7d0e507245..1c8a146647c5717060437656b2488f7d8e0ea25c 100644 (file)
--- 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 4ddb7beae2310c0200b7900cb3b75cbdea7b59a0..7756b492a4f7cebcd63fb69088d58d6bbea0d15a 100644 (file)
--- 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..