* configure.ac: Define GRUB_BOOT_DIR_NAME and GRUB_DIR_NAME macros.
* include/grub/emu/misc.h (DEFAULT_DIRECTORY): Use previous macros.
---
configure.ac | 4 ++++
include/grub/emu/misc.h | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 57df640..00652e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,9 +185,13 @@ case "$host_os" in
esac
bootdirname=`echo "$bootdirname" | sed "$program_transform_name"`
AC_SUBST(bootdirname)
+AC_DEFINE_UNQUOTED(GRUB_BOOT_DIR_NAME, "$bootdirname",
+ [Default boot directory name]")
grubdirname=`echo "$PACKAGE" | sed "$program_transform_name"`
AC_SUBST(grubdirname)
+AC_DEFINE_UNQUOTED(GRUB_DIR_NAME, "$grubdirname",
+ [Default grub directory name])
#
# Checks for build programs.
diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
index 972bc4e..5dddc1e 100644
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -19,6 +19,7 @@
#ifndef GRUB_EMU_MISC_H
#define GRUB_EMU_MISC_H 1
+#include <config.h>
#include <grub/symbol.h>
#include <grub/types.h>
#include <grub/util/libzfs.h>
@@ -32,9 +33,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"
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/grub-devel
