=== modified file 'ChangeLog'
--- ChangeLog	2010-06-03 22:15:52 +0000
+++ ChangeLog	2010-06-03 22:23:22 +0000
@@ -1,5 +1,12 @@
 2010-06-03  Grégoire Sutre  <address@hidden>
 
+	* Makefile.in (install-local): Apply file name transformations to
+	generated locale (*.mo) files.
+	* util/grub-install.in: Likewise.
+	* util/i386/efi/grub-install.in: Likewise.
+
+2010-06-03  Grégoire Sutre  <address@hidden>
+
 	* Makefile.in (install-local): Use installed files on help2man command
 	line to account for file name transformations.  Apply transformations
 	to generated info file.

=== modified file 'Makefile.in'
--- Makefile.in	2010-06-03 22:15:52 +0000
+++ Makefile.in	2010-06-03 22:23:22 +0000
@@ -365,10 +365,11 @@ install-local: all
 	done
 	@langs='$(LINGUAS)'; \
 	for lang in $$langs; do \
-	  $(SHELL) $(mkinstalldirs) $(DESTDIR)/$(datadir)/locale/$$lang/LC_MESSAGES; \
+	  $(SHELL) $(mkinstalldirs) $(DESTDIR)$(datadir)/locale/$$lang/LC_MESSAGES; \
 	  file="po/$$lang.mo"; \
 	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)/$(datadir)/locale/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
+	  dest="`echo $(PACKAGE).mo | sed 's,.*/,,' | sed '$(transform)'`"; \
+	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(datadir)/locale/$$lang/LC_MESSAGES/$$dest; \
 	done
 	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(infodir)
 	@list='$(info_INFOS)'; \

=== modified file 'util/grub-install.in'
--- util/grub-install.in	2010-06-03 22:02:54 +0000
+++ util/grub-install.in	2010-06-03 22:23:22 +0000
@@ -24,6 +24,7 @@ address@hidden@
 address@hidden@
 address@hidden@
 address@hidden@
address@hidden@
 address@hidden@
 address@hidden@
 address@hidden@
@@ -42,6 +43,7 @@ grub_mkimage=${bindir}/`echo grub-mkimag
 grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
 grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
 grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}`
+grub_mofile=`echo ${PACKAGE}.mo | sed ${transform}`
 rootdir=
 modules=
 
@@ -241,8 +243,8 @@ fi
 # Copy gettext files
 mkdir -p ${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"
+    if test -f "$dir/LC_MESSAGES/${grub_mofile}"; then
+        cp -f "$dir/LC_MESSAGES/${grub_mofile}" "${grubdir}/locale/${dir##*/}.mo"
     fi
 done
 

=== modified file 'util/i386/efi/grub-install.in'
--- util/i386/efi/grub-install.in	2010-06-03 22:02:54 +0000
+++ util/i386/efi/grub-install.in	2010-06-03 22:23:22 +0000
@@ -24,6 +24,7 @@ address@hidden@
 address@hidden@
 address@hidden@
 address@hidden@
address@hidden@
 address@hidden@
 address@hidden@
 address@hidden@
@@ -40,6 +41,7 @@ grub_mkimage=${bindir}/`echo grub-mkimag
 grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
 grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
 grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}`
+grub_mofile=`echo ${PACKAGE}.mo | sed ${transform}`
 rootdir=
 modules=
 
@@ -166,8 +168,8 @@ done
 # Copy gettext files
 mkdir -p ${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"
+    if test -f "$dir/LC_MESSAGES/${grub_mofile}"; then
+        cp -f "$dir/LC_MESSAGES/${grub_mofile}" "${grubdir}/locale/${dir##*/}.mo"
     fi
 done