grub-install: Fix inverted test for NLS enabled when copying locales
Commit 3d8439da8
(grub-install: Locale depends on nls) attempted to avoid
copying locale files to the target directory when NLS was disabled.
However the test is inverted, and it does the opposite.
Signed-off-by: Martin Whitaker <fsf@martin-whitaker.me.uk>
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
This commit is contained in:
parent
a6838bbc67
commit
8451454889
1 changed files with 2 additions and 2 deletions
|
@ -598,7 +598,7 @@ copy_all (const char *srcd,
|
||||||
grub_util_fd_closedir (d);
|
grub_util_fd_closedir (d);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !(defined (GRUB_UTIL) && defined(ENABLE_NLS) && ENABLE_NLS)
|
#if (defined (GRUB_UTIL) && defined(ENABLE_NLS) && ENABLE_NLS)
|
||||||
static const char *
|
static const char *
|
||||||
get_localedir (void)
|
get_localedir (void)
|
||||||
{
|
{
|
||||||
|
@ -659,7 +659,7 @@ static void
|
||||||
grub_install_copy_nls(const char *src __attribute__ ((unused)),
|
grub_install_copy_nls(const char *src __attribute__ ((unused)),
|
||||||
const char *dst __attribute__ ((unused)))
|
const char *dst __attribute__ ((unused)))
|
||||||
{
|
{
|
||||||
#if !(defined (GRUB_UTIL) && defined(ENABLE_NLS) && ENABLE_NLS)
|
#if (defined (GRUB_UTIL) && defined(ENABLE_NLS) && ENABLE_NLS)
|
||||||
char *dst_locale;
|
char *dst_locale;
|
||||||
|
|
||||||
dst_locale = grub_util_path_concat (2, dst, "locale");
|
dst_locale = grub_util_path_concat (2, dst, "locale");
|
||||||
|
|
Loading…
Reference in a new issue