TEXTDOMAIN is set to @PACKAGE@ everywhere, use the same instead of
hardcoding "grub.mo".
Signed-off-by: Andrey Borzenkov <arvidj...@gmail.com>
---
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 <arvidj...@gmail.com>
+
+ * util/grub-install_header: Use @PACKAGE@ in message catalog name
+ instead of hardcoding grub.mo.
+
2013-04-05 Vladimir Serbinenko <phco...@gmail.com>
* 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/@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
--
tg: (28877a0..) u/grub-mo (depends on: master)
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
