* 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.

diff --git a/ChangeLog b/ChangeLog
index 0807f1b3b5fd15690ca888641b52099d20b269f2..b86521b52678c207d502ddf82d5352930933303a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * configure.ac: Move nm checks to the end.

diff --git a/util/grub-install.in b/util/grub-install.in
index 4cddf5edad0c8c6a6a89b61f73a5d1e5f4d144dc..c022a6bb9588cf635b3766e9b1fc560f01e40b5b 100644 (file)
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -22,7 +22,6 @@ sysconfdir="@sysconfdir@"
 
 host_os=@host_os@
 target=
-localedir="@datadir@/locale"
 
 grub_probe="${sbindir}/@grub_probe@"
 grub_editenv="${bindir}/@grub_editenv@"

diff --git a/util/grub-install_header b/util/grub-install_header
index 26013fe59e8aa74899a9f3159f597c561452d4dc..2759ae89e4574e0153d30403c363ad509314363c 100644 (file)
--- a/util/grub-install_header
+++ b/util/grub-install_header
@@ -29,6 +29,7 @@ datadir="@datadir@"
 if [ "x$pkgdatadir" = x ]; then
     pkgdatadir="${datadir}/@PACKAGE@"
 fi
+localedir="@datadir@/locale"
 
 self=`basename $0`
 

diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 5a04ec4b65145b87586b08ce84d043202d4a52e9..444ef85fd6459ac62c11de3aa21617744a135028 100644 (file)
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -44,8 +44,6 @@ product_version="${PACKAGE_VERSION}"
 
 xorriso=xorriso
 
-localedir="@datadir@/locale"
-
 # Usage: usage
 # Print the usage.
 usage () {