Blob Blame Raw
From 84643f33b9711f4b3195bec54e1ef674fd12d073 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Sat, 6 Apr 2013 20:14:29 +0200
Subject: [PATCH 268/482] 	* util/grub-install_header: Use @PACKAGE@.mo
 in message catalog name 	instead of hardcoding grub.mo.

---
 ChangeLog                | 5 +++++
 util/grub-install_header | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 954d85f..300ddd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-06  Andrey Borzenkov <arvidjaar@gmail.com>
+
+	* util/grub-install_header: Use @PACKAGE@.mo in message catalog name
+	instead of hardcoding grub.mo.
+
 2013-04-05  Fedora Ninjas <grub2-owner@fedoraproject.org>
 
 	* util/grub.d/30_os-prober.in: Support btrrfs linux-prober extensions.
diff --git a/util/grub-install_header b/util/grub-install_header
index 7c2c0a5..69aac46 100644
--- a/util/grub-install_header
+++ b/util/grub-install_header
@@ -82,16 +82,16 @@ grub_install_files () {
 	    fi
 	done
 	for dir in "${localedir}"/*; do
-	    if test -f "$dir/LC_MESSAGES/grub.mo" && ! test -f "${grub_install_files_target_directory}"/locale/"${dir##*/}.mo"; then
-		cp -f "$dir/LC_MESSAGES/grub.mo" "${grub_install_files_target_directory}"/locale/"${dir##*/}.mo"
+	    if test -f "$dir/LC_MESSAGES/@PACKAGE@.mo" && ! test -f "${grub_install_files_target_directory}"/locale/"${dir##*/}.mo"; then
+		cp -f "$dir/LC_MESSAGES/@PACKAGE@.mo" "${grub_install_files_target_directory}"/locale/"${dir##*/}.mo"
 	    fi
 	done
     else
 	for locale in $install_locales; do
 	    if test -f "${grub_install_files_source_directory}"/po/$locale.mo; then
 		cp -f " "${grub_install_files_source_directory}"/po/$locale.mo" "${grub_install_files_target_directory}"/locale/$locale.mo
-	    elif test -f "${localedir}/$locale/LC_MESSAGES/grub.mo"; then
-		cp -f "${localedir}/$locale/LC_MESSAGES/grub.mo" "${grub_install_files_target_directory}"/locale/$locale.mo
+	    elif test -f "${localedir}/$locale/LC_MESSAGES/@PACKAGE@.mo"; then
+		cp -f "${localedir}/$locale/LC_MESSAGES/@PACKAGE@.mo" "${grub_install_files_target_directory}"/locale/$locale.mo
 	    fi
 	done
     fi
-- 
1.8.2.1