From 9cc16ffde644f02ad00b379af371e9ce36f5f251 Mon Sep 17 00:00:00 2001 From: neil Date: Sat, 15 Sep 2012 19:15:53 +0000 Subject: [PATCH] Adjusted paths for GRUB2 2.00. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@45804 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- arch/i386-pc/boot/iso/mmakefile.src | 4 ++-- arch/x86_64-pc/boot/iso/mmakefile.src | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/i386-pc/boot/iso/mmakefile.src b/arch/i386-pc/boot/iso/mmakefile.src index 3f9e00eb6b..89eb0d5523 100644 --- a/arch/i386-pc/boot/iso/mmakefile.src +++ b/arch/i386-pc/boot/iso/mmakefile.src @@ -25,11 +25,11 @@ BOOTLOADER_ELTORITO_REL := boot/grub/iso9660_stage1_5 endif ifeq ($(AROS_TARGET_BOOTLOADER),grub2) -BOOTLOADER_ELTORITO_REL := boot/grub/grub2_eltorito +BOOTLOADER_ELTORITO_REL := boot/grub/i386-pc/grub2_eltorito endif ifeq ($(AROS_TARGET_BOOTLOADER),grub2gfx) -BOOTLOADER_ELTORITO_REL := boot/grub/grub2_eltorito +BOOTLOADER_ELTORITO_REL := boot/grub/i386-pc/grub2_eltorito endif BOOT_FILES := bootstrap-pc.gz aros-bsp-pc-i386.gz aros-base.pkg.gz aros-fs.pkg.gz poseidon.pkg.gz diff --git a/arch/x86_64-pc/boot/iso/mmakefile.src b/arch/x86_64-pc/boot/iso/mmakefile.src index 9620daf365..047dc7ee00 100644 --- a/arch/x86_64-pc/boot/iso/mmakefile.src +++ b/arch/x86_64-pc/boot/iso/mmakefile.src @@ -19,11 +19,11 @@ BOOTLOADER_ELTORITO_REL := boot/grub/iso9660_stage1_5 endif ifeq ($(AROS_TARGET_BOOTLOADER),grub2) -BOOTLOADER_ELTORITO_REL := boot/grub/grub2_eltorito +BOOTLOADER_ELTORITO_REL := boot/grub/i386-pc/grub2_eltorito endif ifeq ($(AROS_TARGET_BOOTLOADER),grub2gfx) -BOOTLOADER_ELTORITO_REL := boot/grub/grub2_eltorito +BOOTLOADER_ELTORITO_REL := boot/grub/i386-pc/grub2_eltorito endif $(warning BOOTLOADER_ELTORITO_REL = $(BOOTLOADER_ELTORITO_REL)) -- 2.11.4.GIT