2006-05-19 Yoshinori K. Okuji <okuji@enbug.org>

        * util/i386/pc/grub-install.in (bindir): New variable.
        (grub_mkimage): Use BINDIR instead of SBINDIR. Reported by Lee
        Shaver <lbgwjl@gmail.com>.

diff --git a/ChangeLog b/ChangeLog
index 45bef02ec8d32b50309db8b801ccfc7243039b39..f217caef185116f07ec9687d8ace20716d046d9d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-19  Yoshinori K. Okuji  <okuji@enbug.org>
+
+       * util/i386/pc/grub-install.in (bindir): New variable.
+       (grub_mkimage): Use BINDIR instead of SBINDIR. Reported by Lee
+       Shaver <lbgwjl@gmail.com>.
+
 2006-05-14  Yoshinori K. Okuji  <okuji@enbug.org>
 
        * kern/i386/pc/startup.S: Include grub/cpu/linux.h instead of

diff --git a/util/i386/pc/grub-install.in b/util/i386/pc/grub-install.in
index 6be218bb55b5f1005d13f59db437a1dcce9f9dfb..0e0bb55e71db1b4f67f2830484cee2e6962439ab 100644 (file)
--- a/util/i386/pc/grub-install.in
+++ b/util/i386/pc/grub-install.in
@@ -21,6 +21,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 sbindir=@sbindir@
+bindir=@bindir@
 libdir=@libdir@
 PACKAGE_NAME=@PACKAGE_NAME@
 PACKAGE_TARNAME=@PACKAGE_TARNAME@
@@ -30,7 +31,7 @@ platform=@platform@
 pkglibdir=${libdir}/${PACKAGE_TARNAME}/${host_cpu}-${platform}
 
 grub_setup=${sbindir}/grub-setup
-grub_mkimage=${sbindir}/grub-mkimage
+grub_mkimage=${bindir}/grub-mkimage
 grub_mkdevicemap=${sbindir}/grub-mkdevicemap
 grub_probefs=${sbindir}/grub-probefs
 rootdir=