From 0de172a0c03fecc6e2ea4d3d096266880cdde569 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 14 Nov 2013 16:45:27 +0000
Subject: [PATCH 1/2] * 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.

---
 ChangeLog                | 7 +++++++
 util/grub-install.in     | 1 -
 util/grub-install_header | 1 +
 util/grub-mkrescue.in    | 2 --
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0807f1b3b..b86521b52 100644
--- 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 4cddf5eda..c022a6bb9 100644
--- 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 26013fe59..2759ae89e 100644
--- 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 5a04ec4b6..444ef85fd 100644
--- 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 () {

From a5986276ece5e090a64eb222f883bcc2819bf30b Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Fri, 15 Nov 2013 00:51:30 +0400
Subject: [PATCH 2/2] add grub-core/tests/signatures.h to distfiles

---
 ChangeLog                   | 5 +++++
 grub-core/Makefile.core.def | 1 +
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index b86521b52..a68d3ee57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-15  Andrey Borzenkov <arvidjaar@gmail.com>
+
+	* grub-core/Makefile.core.def (signature_test): Add missing
+	tests/signatures.h.
+
 2013-11-14  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-install_header: Set localedir here, since this file is
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 611451938..4fff57f16 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -1914,6 +1914,7 @@ module = {
 module = {
   name = signature_test;
   common = tests/signature_test.c;
+  common = tests/signatures.h;
 };
 
 module = {