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

6
include/grub/emu/misc.h
View file

@ -19,7 +19,7 @@
#ifndef GRUB_EMU_MISC_H
#define GRUB_EMU_MISC_H 1
#include <config-util.h>
#include <config.h>
#include <stdarg.h>
#include <grub/symbol.h>
@ -35,9 +35,9 @@
#ifdef __NetBSD__
/* NetBSD uses /boot for its boot block. */
# define DEFAULT_DIRECTORY "/grub"
# define DEFAULT_DIRECTORY "/"GRUB_DIR_NAME
#else
# define DEFAULT_DIRECTORY "/boot/grub"
# define DEFAULT_DIRECTORY "/"GRUB_BOOT_DIR_NAME"/"GRUB_DIR_NAME
#endif
#define DEFAULT_DEVICE_MAP DEFAULT_DIRECTORY "/device.map"