From: Felix Zielcke <fzielcke@z-51.de>
Date: Thu, 26 Nov 2009 16:15:16 +0000 (+0100)
Subject: 2009-11-26 Felix Zielcke <fzielcke@z-51.de>
X-Git-Tag: 1.98~353
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=242668a26a38ce808cb2f952d45c7b0665755fc9;p=thirdparty%2Fgrub.git

2009-11-26 Felix Zielcke <fzielcke@z-51.de>

	* util/i386/efi/grub-mkimage.c: Include "progname.h".
	(main): Use `program_name' instead of nonexistent `progname'.
---

diff --git a/ChangeLog b/ChangeLog
index cae094af9..4c6589a5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-26 Felix Zielcke <fzielcke@z-51.de>
+
+	* util/i386/efi/grub-mkimage.c: Include "progname.h".
+	(main): Use `program_name' instead of nonexistent `progname'.
+
 2009-11-26  Felix Zielcke  <fzielcke@z-51.de>
 
 	* conf/i386-efi.rmk (grub_mkimage_SOURCES): Add `gnulib/progname.c'.
diff --git a/util/i386/efi/grub-mkimage.c b/util/i386/efi/grub-mkimage.c
index 29a823e58..401c5006c 100644
--- a/util/i386/efi/grub-mkimage.c
+++ b/util/i386/efi/grub-mkimage.c
@@ -30,6 +30,7 @@
 #include <grub/kernel.h>
 #include <grub/efi/pe32.h>
 #include <grub/machine/kernel.h>
+#include "progname.h"
 
 #if GRUB_TARGET_WORDSIZE == 32
 # define grub_le_to_cpu(val) grub_le_to_cpu32(val)
@@ -1056,7 +1057,7 @@ main (int argc, char *argv[])
   char *dir = NULL;
   char *prefix = NULL;
 
-  progname = "grub-mkimage";
+  program_name = "grub-mkimage";
 
   while (1)
     {