Index: conf/powerpc-ieee1275.rmk
===================================================================
RCS file: /sources/grub/grub2/conf/powerpc-ieee1275.rmk,v
retrieving revision 1.53
diff -u -p -r1.53 powerpc-ieee1275.rmk
--- conf/powerpc-ieee1275.rmk	21 Apr 2006 00:47:11 -0000	1.53
+++ conf/powerpc-ieee1275.rmk	21 Apr 2006 03:16:05 -0000
@@ -7,23 +7,23 @@ COMMON_LDFLAGS += -nostdlib
 
 # Images.
 
-MOSTLYCLEANFILES += grubof_symlist.c kernel_syms.lst
+MOSTLYCLEANFILES += grub_symlist.c kernel_syms.lst
 DEFSYMFILES += kernel_syms.lst
 
-grubof_HEADERS = arg.h boot.h device.h disk.h dl.h elf.h env.h err.h \
+grub_HEADERS = arg.h boot.h device.h disk.h dl.h elf.h env.h err.h \
 	file.h fs.h kernel.h misc.h mm.h net.h parser.h rescue.h symbol.h \
 	term.h types.h powerpc/libgcc.h loader.h \
 	partition.h pc_partition.h ieee1275/ieee1275.h machine/time.h \
 	machine/kernel.h
 
-grubof_symlist.c: $(addprefix include/grub/,$(grubof_HEADERS)) gensymlist.sh
+grub_symlist.c: $(addprefix include/grub/,$(grub_HEADERS)) gensymlist.sh
 	sh $(srcdir)/gensymlist.sh $(filter %.h,$^) > $@
 
-kernel_syms.lst: $(addprefix include/grub/,$(grubof_HEADERS)) genkernsyms.sh
+kernel_syms.lst: $(addprefix include/grub/,$(grub_HEADERS)) genkernsyms.sh
 	sh $(srcdir)/genkernsyms.sh $(filter %h,$^) > $@
 
 # Programs
-pkgdata_PROGRAMS = grubof
+pkgdata_PROGRAMS = grub
 
 # Utilities.
 bin_UTILITIES = grub-emu
@@ -59,18 +59,18 @@ grub_emu_SOURCES = commands/boot.c comma
 
 grub_emu_LDFLAGS = $(LIBCURSES)
 
-grubof_SOURCES = kern/powerpc/ieee1275/crt0.S kern/powerpc/ieee1275/cmain.c \
+grub_SOURCES = kern/powerpc/ieee1275/crt0.S kern/powerpc/ieee1275/cmain.c \
 	kern/ieee1275/ieee1275.c kern/main.c kern/device.c 		\
 	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c 		\
 	kern/misc.c kern/mm.c kern/loader.c kern/rescue.c kern/term.c 	\
 	kern/powerpc/ieee1275/init.c term/ieee1275/ofconsole.c 		\
 	kern/powerpc/ieee1275/openfw.c disk/ieee1275/ofdisk.c 		\
 	kern/parser.c kern/partition.c kern/env.c kern/powerpc/dl.c 	\
-	grubof_symlist.c kern/powerpc/cache.S
-grubof_HEADERS = grub/powerpc/ieee1275/ieee1275.h
-grubof_CFLAGS = $(COMMON_CFLAGS)
-grubof_ASFLAGS = $(COMMON_ASFLAGS)
-grubof_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
+	grub_symlist.c kern/powerpc/cache.S
+grub_HEADERS = grub/powerpc/ieee1275/ieee1275.h
+grub_CFLAGS = $(COMMON_CFLAGS)
+grub_ASFLAGS = $(COMMON_ASFLAGS)
+grub_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
 	-Wl,-N,-S,-Ttext,0x200000,-Bstatic
 
 # For genmoddep.
Index: conf/sparc64-ieee1275.rmk
===================================================================
RCS file: /sources/grub/grub2/conf/sparc64-ieee1275.rmk,v
retrieving revision 1.9
diff -u -p -r1.9 sparc64-ieee1275.rmk
--- conf/sparc64-ieee1275.rmk	21 Apr 2006 00:47:11 -0000	1.9
+++ conf/sparc64-ieee1275.rmk	21 Apr 2006 03:16:05 -0000
@@ -7,27 +7,27 @@ COMMON_LDFLAGS = -melf64_sparc -nostdlib
 
 # Images.
 
-MOSTLYCLEANFILES += grubof_symlist.c kernel_syms.lst
+MOSTLYCLEANFILES += grub_symlist.c kernel_syms.lst
 DEFSYMFILES += kernel_syms.lst
 
-grubof_HEADERS = arg.h boot.h device.h disk.h dl.h elf.h env.h err.h \
+grub_HEADERS = arg.h boot.h device.h disk.h dl.h elf.h env.h err.h \
 	file.h fs.h kernel.h misc.h mm.h net.h parser.h rescue.h symbol.h \
 	term.h types.h sparc64/libgcc.h loader.h \
 	partition.h pc_partition.h ieee1275/ieee1275.h machine/time.h \
 	machine/kernel.h
 
-grubof_symlist.c: $(addprefix include/grub/,$(grubof_HEADERS)) gensymlist.sh
+grub_symlist.c: $(addprefix include/grub/,$(grub_HEADERS)) gensymlist.sh
 	sh $(srcdir)/gensymlist.sh $(filter %.h,$^) > $@
 
 # For the parser.
 grub_script.tab.c grub_script.tab.h: normal/parser.y
 	$(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
 
-kernel_syms.lst: $(addprefix include/grub/,$(grubof_HEADERS)) genkernsyms.sh
+kernel_syms.lst: $(addprefix include/grub/,$(grub_HEADERS)) genkernsyms.sh
 	sh $(srcdir)/genkernsyms.sh $(filter %h,$^) > $@
 
 # Programs
-pkgdata_PROGRAMS = grubof
+pkgdata_PROGRAMS = grub
 
 # Utilities.
 #bin_UTILITIES = grub-emu grub-mkimage
@@ -63,17 +63,17 @@ grub_mkimage_SOURCES = util/sparc64/ieee
 
 grub_emu_LDFLAGS = $(LIBCURSES)
 
-grubof_SOURCES = kern/sparc64/ieee1275/init.c kern/ieee1275/ieee1275.c \
+grub_SOURCES = kern/sparc64/ieee1275/init.c kern/ieee1275/ieee1275.c \
 	kern/main.c kern/device.c kern/disk.c kern/dl.c kern/file.c \
 	kern/fs.c kern/err.c kern/misc.c kern/mm.c kern/loader.c \
 	kern/rescue.c kern/term.c term/ieee1275/ofconsole.c \
 	kern/sparc64/ieee1275/openfw.c disk/ieee1275/ofdisk.c \
-	kern/partition.c kern/env.c kern/sparc64/dl.c grubof_symlist.c \
+	kern/partition.c kern/env.c kern/sparc64/dl.c grub_symlist.c \
 	kern/sparc64/cache.S kern/parser.c
-grubof_HEADERS = grub/sparc64/ieee1275/ieee1275.h
-grubof_CFLAGS = $(COMMON_CFLAGS)
-grubof_ASFLAGS = $(COMMON_ASFLAGS)
-grubof_LDFLAGS = -mno-app-regs -nostdlib -Wl,-N,-Ttext,0x200000,-Bstatic,-melf64_sparc
+grub_HEADERS = grub/sparc64/ieee1275/ieee1275.h
+grub_CFLAGS = $(COMMON_CFLAGS)
+grub_ASFLAGS = $(COMMON_ASFLAGS)
+grub_LDFLAGS = -mno-app-regs -nostdlib -Wl,-N,-Ttext,0x200000,-Bstatic,-melf64_sparc
 
 # For genmoddep.
 genmoddep_SOURCES = util/genmoddep.c
Index: util/powerpc/ieee1275/grub-mkimage.c
===================================================================
RCS file: /sources/grub/grub2/util/powerpc/ieee1275/grub-mkimage.c,v
retrieving revision 1.4
diff -u -p -r1.4 grub-mkimage.c
--- util/powerpc/ieee1275/grub-mkimage.c	3 Nov 2005 05:05:05 -0000	1.4
+++ util/powerpc/ieee1275/grub-mkimage.c	21 Apr 2006 03:16:06 -0000
@@ -168,7 +168,7 @@ add_segments (char *dir, FILE *out, int 
   int i;
 
   /* Read ELF header.  */
-  kernel_path = grub_util_get_path (dir, "grubof");
+  kernel_path = grub_util_get_path (dir, "grub");
   in = fopen (kernel_path, "rb");
   if (! in)
     grub_util_error ("cannot open %s", kernel_path);