Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1OxKMi-0001u9-37 for mharc-grub-devel@gnu.org; Sun, 19 Sep 2010 09:55:36 -0400 Received: from [140.186.70.92] (port=52292 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OxKMe-0001sB-NH for grub-devel@gnu.org; Sun, 19 Sep 2010 09:55:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OxKMd-0006cV-Ch for grub-devel@gnu.org; Sun, 19 Sep 2010 09:55:32 -0400 Received: from smtp4-g21.free.fr ([212.27.42.4]:42165) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OxKMc-0006bZ-LZ for grub-devel@gnu.org; Sun, 19 Sep 2010 09:55:31 -0400 Received: from yves.private.network (unknown [88.175.100.234]) by smtp4-g21.free.fr (Postfix) with ESMTP id D69934C8141 for ; Sun, 19 Sep 2010 15:55:23 +0200 (CEST) Received: from yves.private.network (localhost [127.0.0.1]) by yves.private.network (Postfix) with ESMTP id 91CA090B1AE for ; Sun, 19 Sep 2010 15:55:22 +0200 (CEST) Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=MIMEBOUNDARY To: grub-devel@gnu.org From: Yves Blusseau Date: Sun, 19 Sep 2010 15:55:22 +0200 Message-ID: <20100919135522.94946.55755.stgit@yves.private.network> User-Agent: StGit/0.15-97-g9680 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [PATCH] Keep boot and grub directory names in sync with utils scripts X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Sep 2010 13:55:33 -0000 This is a MIME message. --MIMEBOUNDARY Content-Disposition: inline MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit * 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(-) --MIMEBOUNDARY Content-Disposition: attachment; filename=define-boot-grub-dir-macros.patch MIME-Version: 1.0 Content-Type: text/plain; name=define-boot-grub-dir-macros.patch; charset="utf-8" Content-Transfer-Encoding: 7bit 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 #include #include #include @@ -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" --MIMEBOUNDARY--