Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UO5Wu-0001cO-IH for mharc-grub-devel@gnu.org; Fri, 05 Apr 2013 08:14:04 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56135) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO5Wq-0001UJ-Hd for grub-devel@gnu.org; Fri, 05 Apr 2013 08:14:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UO5Wp-0003eG-0P for grub-devel@gnu.org; Fri, 05 Apr 2013 08:14:00 -0400 Received: from mail-la0-x230.google.com ([2a00:1450:4010:c03::230]:54159) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO5Wo-0003e3-Nv for grub-devel@gnu.org; Fri, 05 Apr 2013 08:13:58 -0400 Received: by mail-la0-f48.google.com with SMTP id fq13so3373464lab.21 for ; Fri, 05 Apr 2013 05:13:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:subject:date:message-id:x-mailer; bh=OrjcnVqVCjLysFel4E32eiMpl6Jq4FnNjP1Q59LbBBs=; b=y3xvizqtf2rMBkTAYkaambLOvA4+n1Y3HFRykstLUn395mzppATZJftVi5RIBgEpYw EzaV0mS5A7ZICOELxwNX0U7q+YweUXJIXUCnQmPnpo9JSnM4pwDjtf7QMqVDBaZHCtEs lIjIQZcBVATOskBw1nGA1BP0ppYv2fH8f8llNZ9/gYkMDxomOzoH0kqur+a3EsjGUEDM ekg7NgTECGwul/MVSRuY9NiTtD7KMV7nN/hSJbewchEtODUFmhEEz0JtACuLQ3zGsjed dlT7wtCCPW88jJllUDkWoA53uML3U7uxC/z6VhOsVdt+gG4KzEa/yOfA6jZXk5bX1Jxj m9aQ== X-Received: by 10.112.39.106 with SMTP id o10mr6039247lbk.23.1365164037667; Fri, 05 Apr 2013 05:13:57 -0700 (PDT) Received: from localhost.localdomain ([94.29.72.160]) by mx.google.com with ESMTPS id c7sm5388673lbe.6.2013.04.05.05.13.56 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 05 Apr 2013 05:13:57 -0700 (PDT) From: Andrey Borzenkov To: grub-devel@gnu.org Subject: [PATCH] do not hardcode grub.mo in grub-install_header Date: Fri, 5 Apr 2013 16:12:59 +0400 Message-Id: <1365163979-9254-1-git-send-email-arvidjaar@gmail.com> X-Mailer: git-send-email 1.8.1.4 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::230 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Apr 2013 12:14:02 -0000 TEXTDOMAIN is set to @PACKAGE@ everywhere, use the same instead of hardcoding "grub.mo". Signed-off-by: Andrey Borzenkov --- 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 + + * util/grub-install_header: Use @PACKAGE@ in message catalog name + instead of hardcoding grub.mo. + 2013-04-05 Vladimir Serbinenko * 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)