From a20f6ad048efff3fcf7a95ce9d269a839d3d6ecb Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Mon, 23 Apr 2012 17:17:50 +0200 Subject: [PATCH] * util/grub-mkrescue.in: Fix locale directory. --- ChangeLog | 4 ++++ util/grub-mkrescue.in | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 11db1ef2e..77f879d8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-04-23 Vladimir Serbinenko + + * util/grub-mkrescue.in: Fix locale directory. + 2012-04-23 Vladimir Serbinenko * grub-core/kern/emu/hostdisk.c (map): Make static. diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in index 491aec7df..6210e7ba3 100644 --- a/util/grub-mkrescue.in +++ b/util/grub-mkrescue.in @@ -52,6 +52,8 @@ xorriso=xorriso export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAINDIR="@localedir@" +localedir="@datadir@/locale" + . "${pkgdatadir}/grub-mkconfig_lib" # Usage: usage @@ -182,9 +184,9 @@ process_input_dir () done mkdir -p "${iso9660_dir}/boot/grub/locale" - for file in "${input_dir}"/po/*.mo; do - if test -f "$file"; then - cp -f "$file" ${iso9660_dir}/boot/grub/locale/ + for dir in "${localedir}"/*; do + if test -f "$dir/LC_MESSAGES/grub.mo"; then + cp -f "$dir/LC_MESSAGES/grub.mo" "${iso9660_dir}/boot/grub/locale/${dir##*/}.mo" fi done }