From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 16 Sep 2010 13:50:41 +0000 (+0100)
Subject: Explicitly pass -d ${pkglibdir} to grub-mkimage, to make it easier to
X-Git-Tag: 1.99~485^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c514c29712e89b5ef7a3423787820ddeb9a80154;p=thirdparty%2Fgrub.git

Explicitly pass -d ${pkglibdir} to grub-mkimage, to make it easier to
run grub-install from the build directory.
---

diff --git a/util/grub-install.in b/util/grub-install.in
index 0ef4cfe84..955bf0257 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -552,7 +552,7 @@ case "${target_cpu}-${platform}" in
 esac
 
 
-$grub_mkimage ${config_opt} -O ${mkimage_target} --output=${grubdir}/core.${imgext} --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
+$grub_mkimage ${config_opt} -d ${pkglibdir} -O ${mkimage_target} --output=${grubdir}/core.${imgext} --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
 
 # Backward-compatibility kludges
 if [ "${target_cpu}-${platform}" = "mips-yeeloong" ]; then
@@ -560,7 +560,7 @@ if [ "${target_cpu}-${platform}" = "mips-yeeloong" ]; then
 elif [ "${target_cpu}-${platform}" = "i386-ieee1275" ] || [ "${target_cpu}-${platform}" = "powerpc-ieee1275" ]; then
     cp ${grubdir}/core.${imgext} /boot/grub/grub
 elif [ "${target_cpu}-${platform}" = "i386-efi" ] || [ "${target_cpu}-${platform}" = "x86_64-efi" ]; then
-    $grub_mkimage ${config_opt} -O ${mkimage_target} --output=${grubdir}/grub.efi --prefix="" $modules || exit 1
+    $grub_mkimage ${config_opt} -d ${pkglibdir} -O ${mkimage_target} --output=${grubdir}/grub.efi --prefix="" $modules || exit 1
 fi