From: okuji <okuji@localhost>
Date: Tue, 26 Jul 2005 20:05:47 +0000 (+0000)
Subject: 2005-07-26  Yoshinori K. Okuji  <okuji@enbug.org>
X-Git-Tag: 1.98~2108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=141a288bb04428f9265495b6cc3e34dc43965f8f;p=thirdparty%2Fgrub.git

2005-07-26  Yoshinori K. Okuji  <okuji@enbug.org>

        * util/i386/pc/grub-install.in (datadir): New variable.
        (libdir): Removed.
        (pkgdatadir): New variable.
        (pkglibdir): Removed.
---

diff --git a/ChangeLog b/ChangeLog
index 1d8f5131e..9e89ce3db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-26  Yoshinori K. Okuji  <okuji@enbug.org>
+
+	* util/i386/pc/grub-install.in (datadir): New variable.
+	(libdir): Removed.
+	(pkgdatadir): New variable.
+	(pkglibdir): Removed.
+
 2005-07-24  Yoshinori K. Okuji  <okuji@enbug.org>
 
 	* DISTLIST: Added util/i386/pc/grub-install.in.
diff --git a/util/i386/pc/grub-install.in b/util/i386/pc/grub-install.in
index 6dc50da56..2d746f1f9 100644
--- a/util/i386/pc/grub-install.in
+++ b/util/i386/pc/grub-install.in
@@ -21,14 +21,14 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 sbindir=@sbindir@
-libdir=@libdir@
+datadir=@datadir@
 PACKAGE_NAME=@PACKAGE_NAME@
 PACKAGE_TARNAME=@PACKAGE_TARNAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@
 host_cpu=@host_cpu@
 host_os=@host_os@
 host_vendor=@host_vendor@
-pkgdatadir=${libdir}/${PACKAGE_TARNAME}/${host_cpu}-${host_vendor}
+pkgdatadir=${datadir}/${PACKAGE_TARNAME}/${host_cpu}-${host_vendor}
 
 grub_setup=${sbindir}/grub-setup
 grub_mkimage=${sbindir}/grub-mkimage