[2481] 2009-08-08 Pavel Roskin <[email protected]>

Revision: 2481
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2481
Author:   proski
Date:     2009-08-08 04:28:12 +0000 (Sat, 08 Aug 2009)
Log Message:
-----------
2009-08-08  Pavel Roskin  <[email protected]>

	* util/grub-mkconfig.in: Define datarootdir, datadir may depend
	on it.  Add missing space before closing bracket.  Fix
	misleading formatting.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/util/grub-mkconfig.in

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog	2009-08-07 17:18:12 UTC (rev 2480)
+++ trunk/grub2/ChangeLog	2009-08-08 04:28:12 UTC (rev 2481)
@@ -1,3 +1,9 @@
+2009-08-08  Pavel Roskin  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* docs/grub.texi: Major overhaul.  Remove all sections that are

Modified: trunk/grub2/util/grub-mkconfig.in
===================================================================
--- trunk/grub2/util/grub-mkconfig.in	2009-08-07 17:18:12 UTC (rev 2480)
+++ trunk/grub2/util/grub-mkconfig.in	2009-08-08 04:28:12 UTC (rev 2481)
@@ -24,6 +24,7 @@
 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 @@
 	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..