* util/grub-install_header: Use @PACKAGE@.mo in message catalog name

	instead of hardcoding grub.mo.

diff --git a/ChangeLog b/ChangeLog
index 954d85fe8575749a88b577825caefca804d54e1a..300ddd03c0ed35409d91919dcd6205a176d32139 100644 (file)
--- 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 7c2c0a5bdd481e6f18a1714ff36f0f3736cc4480..69aac467c2411f48709066b099b82f0d28b55184 100644 (file)
--- 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