* util/grub-install.in: Copy .mo files from @datadir@/locale, to

match where 'make install' puts them.
* util/i386/efi/grub-install.in: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 6875f1afe01aefd1c86124ffa63c051c2823ae0f..55c45af87d6fedc0eeffb9a23e9a972cb00b82f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-21  Colin Watson  <cjwatson@ubuntu.com>
+
+       * util/grub-install.in: Copy .mo files from @datadir@/locale, to
+       match where 'make install' puts them.
+       * util/i386/efi/grub-install.in: Likewise.
+
 2010-03-19  Colin Watson  <cjwatson@ubuntu.com>
 
        * .bzrignore: Add gentrigtables, grub-script-check,

diff --git a/util/grub-install.in b/util/grub-install.in
index bb323d7062e9e34233d389df34a654889f117095..872dde4a2a9b284b09726914bb848cd2ca828b3e 100644 (file)
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -32,6 +32,7 @@ platform=@platform@
 host_os=@host_os@
 font=@datadir@/@PACKAGE_TARNAME@/ascii.pf2
 pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
+localedir=@datadir@/locale
 
 grub_setup=${sbindir}/`echo grub-setup | sed ${transform}`
 if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ] || [ "${target_cpu}-${platform}" = "mips-yeeloong" ] ; then
@@ -263,9 +264,9 @@ fi
 
 # Copy gettext files
 mkdir -p ${grubdir}/locale/
-for file in ${grubdir}/locale/*.mo ${pkglibdir}/locale/*.mo; do
-    if test -f "$file"; then
-        cp -f "$file" ${grubdir}/locale/
+for dir in ${localedir}/*; do
+    if test -f "$dir/LC_MESSAGES/grub.mo"; then
+        cp -f "$dir/LC_MESSAGES/grub.mo" "${grubdir}/locale/${dir##*/}.mo"
     fi
 done
 

diff --git a/util/i386/efi/grub-install.in b/util/i386/efi/grub-install.in
index 6a8573e81ed9772cee3ff37aa8f3e020388308db..a97960562cb8d27699c36598e1ebb23eabaeb22e 100644 (file)
--- a/util/i386/efi/grub-install.in
+++ b/util/i386/efi/grub-install.in
@@ -31,6 +31,7 @@ target_cpu=@target_cpu@
 platform=@platform@
 host_os=@host_os@
 pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
+localedir=@datadir@/locale
 
 grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
 grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
@@ -182,9 +183,9 @@ done
 
 # Copy gettext files
 mkdir -p ${grubdir}/locale/
-for file in ${grubdir}/locale/*.mo ${pkglibdir}/locale/*.mo; do
-    if test -f "$file"; then
-        cp -f "$file" ${grubdir}/locale/
+for dir in ${localedir}/*; do
+    if test -f "$dir/LC_MESSAGES/grub.mo"; then
+        cp -f "$dir/LC_MESSAGES/grub.mo" "${grubdir}/locale/${dir##*/}.mo"
     fi
 done