Changes in boot/Makefile.grub [cfb1217:c573e0f] in mainline

File:

• boot/Makefile.grub (modified) (3 diffs)

boot/Makefile.grub

@@ -33 +33 @@
 GRUB = grub.$(GRUB_ARCH)
 BOOT = $(DISTROOT)/boot
-BOOT_CONFIG = $(BOOT)/grub/grub.cfg
 
 ELTORITO = boot/grub/$(GRUB_ARCH).img
@@ -39 +38 @@
 
 ifeq ($(GRUB_ARCH),pc)
+        BOOT_CONFIG = $(BOOT)/grub/i386-pc/grub.cfg
         MULTIBOOT_CMD = multiboot
         MODULE_CMD = module
 endif
 ifeq ($(GRUB_ARCH),efi)
+        BOOT_CONFIG = $(BOOT)/grub/grub.cfg
         MULTIBOOT_CMD = multiboot2
         MODULE_CMD = module2
@@ -54 +55 @@
 endif
 ifeq ($(GRUB_ARCH),efi)
-        $(GENISOIMAGE) -J -r -input-charset utf-8 -V "HelenOS boot ISO" --efi-boot $(ELTORITO) -o $@ $(DISTROOT)/
+        $(GENISOIMAGE) -J -r -input-charset utf-8 -V "HelenOS boot ISO" -efi-boot $(ELTORITO) -o $@ $(DISTROOT)/
 endif