vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Keep boot and grub directory names in sync with utils scripts

Browse source 
* configure.ac: Define GRUB_BOOT_DIR_NAME and GRUB_DIR_NAME macros.
    * config.h.in: Add previous macros.
    * include/grub/emu/misc.h (DEFAULT_DIRECTORY): Use previous macros.
    * util/grub-install.in: Use $bootdir and $grubdir variables.
This commit is contained in:
Yves Blusseau 2010-09-21 11:42:30 +02:00
parent 4eff79d2f9
commit a4c1d277c1
5 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
util/grub-install.in
View file

@ -561,9 +561,9 @@ $grub_mkimage ${config_opt} -d ${pkglibdir} -O ${mkimage_target} --output=${grub
# Backward-compatibility kludges
if [ "${target_cpu}-${platform}" = "mips-yeeloong" ]; then
cp ${grubdir}/core.${imgext} /boot/grub.elf
cp ${grubdir}/core.${imgext} ${bootdir}/grub.elf
elif [ "${target_cpu}-${platform}" = "i386-ieee1275" ] || [ "${target_cpu}-${platform}" = "powerpc-ieee1275" ]; then
cp ${grubdir}/core.${imgext} /boot/grub/grub
cp ${grubdir}/core.${imgext} ${grubdir}/grub
elif [ "${target_cpu}-${platform}" = "i386-efi" ] || [ "${target_cpu}-${platform}" = "x86_64-efi" ]; then
$grub_mkimage ${config_opt} -d ${pkglibdir} -O ${mkimage_target} --output=${grubdir}/grub.efi --prefix="" $modules || exit 1
fi