From: Martin Whitaker Date: Mon, 25 May 2020 19:02:10 +0000 (+0200) Subject: grub-install: Fix inverted test for NLS enabled when copying locales X-Git-Tag: grub-2.06-rc1~209 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=8451454889f3b46312cc16eb07970d6c20da0812;p=thirdparty%2Fgrub.git 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 Signed-off-by: Daniel Kiper Reviewed-by: Javier Martinez Canillas --- diff --git a/util/grub-install-common.c b/util/grub-install-common.c index 0295d40f5..277eaf4e2 100644 --- a/util/grub-install-common.c +++ b/util/grub-install-common.c @@ -598,7 +598,7 @@ copy_all (const char *srcd, 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 * get_localedir (void) { @@ -659,7 +659,7 @@ static void grub_install_copy_nls(const char *src __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; dst_locale = grub_util_path_concat (2, dst, "locale");