From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Dec 2009 08:51:36 +0000 (+0100)
Subject: merge mainline into mips
X-Git-Tag: 1.98~160^2~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f41a23d4ecba6c2e58bac086ffdcd609247f146;p=thirdparty%2Fgrub.git

merge mainline into mips
---

4f41a23d4ecba6c2e58bac086ffdcd609247f146
diff --cc conf/i386-pc.rmk
index 9fc4b8df0,7e54b3b67..fb190c82b
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@@ -81,10 -81,10 +81,10 @@@ kernel_syms.lst: $(addprefix include/gr
  
  # Utilities.
  bin_UTILITIES = grub-mkimage
- sbin_UTILITIES = grub-setup grub-mkdevicemap
+ sbin_UTILITIES = grub-setup
  
  # For grub-mkimage.
 -grub_mkimage_SOURCES = gnulib/progname.c util/i386/pc/grub-mkimage.c util/misc.c \
 +grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkrawimage.c util/misc.c \
  	util/resolve.c lib/LzmaEnc.c lib/LzFind.c
  grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
  util/i386/pc/grub-mkimage.c_DEPENDENCIES = Makefile
diff --cc util/elf/grub-mkimage.c
index ea5a1f64e,5750543ad..7427997d3
--- a/util/elf/grub-mkimage.c
+++ b/util/elf/grub-mkimage.c
@@@ -378,10 -358,12 +381,13 @@@ main (int argc, char *argv[]
    char *dir = NULL;
    char *prefix = NULL;
    char *memdisk = NULL;
 +  char *config = NULL;
    int chrp = 0;
  
-   progname = "grub-mkimage";
+   set_program_name (argv[0]);
+   setlocale (LC_ALL, "");
+   bindtextdomain (PACKAGE, LOCALEDIR);
+   textdomain (PACKAGE);
  
    while (1)
      {