* util/grub-install_header: Set localedir here, since this file is

where it's used.
* util/grub-install.in: Remove setting of localedir.
* util/grub-mkrescue.in: Likewise.
This commit is contained in:
Colin Watson 2013-11-14 16:45:27 +00:00
parent 20aea9492f
commit 0de172a0c0
4 changed files with 8 additions and 3 deletions

View file

@ -1,3 +1,10 @@
2013-11-14 Colin Watson <cjwatson@ubuntu.com>
* util/grub-install_header: Set localedir here, since this file is
where it's used.
* util/grub-install.in: Remove setting of localedir.
* util/grub-mkrescue.in: Likewise.
2013-11-14 Vladimir Serbinenko <phcoder@gmail.com> 2013-11-14 Vladimir Serbinenko <phcoder@gmail.com>
* configure.ac: Move nm checks to the end. * configure.ac: Move nm checks to the end.

View file

@ -22,7 +22,6 @@ sysconfdir="@sysconfdir@"
host_os=@host_os@ host_os=@host_os@
target= target=
localedir="@datadir@/locale"
grub_probe="${sbindir}/@grub_probe@" grub_probe="${sbindir}/@grub_probe@"
grub_editenv="${bindir}/@grub_editenv@" grub_editenv="${bindir}/@grub_editenv@"

View file

@ -29,6 +29,7 @@ datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/@PACKAGE@" pkgdatadir="${datadir}/@PACKAGE@"
fi fi
localedir="@datadir@/locale"
self=`basename $0` self=`basename $0`

View file

@ -44,8 +44,6 @@ product_version="${PACKAGE_VERSION}"
xorriso=xorriso xorriso=xorriso
localedir="@datadir@/locale"
# Usage: usage # Usage: usage
# Print the usage. # Print the usage.
usage () { usage () {