vbatts
/
grub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* util/grub-install-common.c (copy_locales): Consistently use 

grub_util_get_localedir () rather than LOCALEDIR.
(grub_install_copy_files): Likewise.
This commit is contained in:
Colin Watson 2013-11-19 15:35:44 +00:00
parent 7960d3e182
commit 4402db3ecc
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2013-11-19 Colin Watson <cjwatson@ubuntu.com>
* util/grub-install-common.c (copy_locales): Consistently use
grub_util_get_localedir () rather than LOCALEDIR.
(grub_install_copy_files): Likewise.
2013-11-19 Josh Triplett <josh@joshtriplett.org>
* grub-core/kern/x86_64/efi/startup.S (_start): Align the stack to a

6
util/grub-install-common.c
View File

@ -558,7 +558,7 @@ copy_locales (const char *dstd)
grub_util_fd_dirent_t de;
const char *locale_dir = grub_util_get_localedir ();
d = grub_util_fd_opendir (LOCALEDIR);
d = grub_util_fd_opendir (locale_dir);
if (!d)
{
grub_util_warn (_("cannot open directory `%s': %s"),
@ -706,6 +706,8 @@ grub_install_copy_files (const char *src,
}
else
{
const char *locale_dir = grub_util_get_localedir ();
for (i = 0; i < install_locales.n_entries; i++)
{
char *srcf = grub_util_path_concat_ext (3, src,
@ -723,7 +725,7 @@ grub_install_copy_files (const char *src,
}
free (srcf);
srcf = grub_util_path_concat_ext (4,
LOCALEDIR,
locale_dir,
install_locales.entries[i],
"LC_MESSAGES",
PACKAGE,