grub-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] do not hardcode grub.mo in grub-install_header


From: Andrey Borzenkov
Subject: [PATCH] do not hardcode grub.mo in grub-install_header
Date: Fri, 5 Apr 2013 16:12:59 +0400

TEXTDOMAIN is set to @PACKAGE@ everywhere, use the same instead of
hardcoding "grub.mo".

Signed-off-by: Andrey Borzenkov <address@hidden>

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

diff --git a/ChangeLog b/ChangeLog
index 41370a1..e1985f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-05  Andrey Borzenkov <address@hidden>
+
+       * util/grub-install_header: Use @PACKAGE@ in message catalog name
+        instead of hardcoding grub.mo.
+
 2013-04-05  Vladimir Serbinenko  <address@hidden>
 
        * util/grub-mkfont.c: Prefer enum to #define.
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/@address@hidden" && ! test -f 
"${grub_install_files_target_directory}"/locale/"${dir##*/}.mo"; then
+               cp -f "$dir/LC_MESSAGES/@address@hidden" 
"${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/@address@hidden"; 
then
+               cp -f "${localedir}/$locale/LC_MESSAGES/@address@hidden" 
"${grub_install_files_target_directory}"/locale/$locale.mo
            fi
        done
     fi
-- 
tg: (28877a0..) u/grub-mo (depends on: master)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]