From: Arnout Vandecappelle <arnout@mind.be>
Date: Wed, 5 Jul 2017 11:14:47 +0000 (+0200)
Subject: grub2: install in $(HOST_DIR) instead of $(HOST_DIR)/usr
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6895400fd23831342c9ca79c14eb102943772fa2;p=buildroot.git

grub2: install in $(HOST_DIR) instead of $(HOST_DIR)/usr

grub2 builds for the target but installs with DESTDIR=$(HOST_DIR). Since
we set prefix to /usr in TARGET_CONF_OPTS, this results in installing
things in $(HOST_DIR)/usr.

To make sure we don't install in $(HOST_DIR)/usr, override --prefix and
--exec-prefix.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---

diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk
index 5082ececdd..eeda6ab27e 100644
--- a/boot/grub2/grub2.mk
+++ b/boot/grub2/grub2.mk
@@ -63,6 +63,8 @@ GRUB2_CONF_ENV = \
 GRUB2_CONF_OPTS = \
 	--target=$(GRUB2_TARGET) \
 	--with-platform=$(GRUB2_PLATFORM) \
+	--prefix=/ \
+	--exec-prefix=/ \
 	--disable-grub-mkfont \
 	--enable-efiemu=no \
 	ac_cv_lib_lzma_lzma_code=no \