From 3dbcd5f65672eaf32d848dface2a91027fd30909 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 28 Apr 2019 22:39:06 +0200 Subject: [PATCH] Fix msginit-4 test failure on mingw. * gettext-tools/src/Makefile.am (DEFS): Define EXEEXT. * gettext-tools/src/msginit.c (plural_forms): On Windows, invoke "cldr-plurals.exe", not "cldr-plurals". --- gettext-tools/src/Makefile.am | 3 ++- gettext-tools/src/msginit.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am index 83994be0b..09a3c153d 100644 --- a/gettext-tools/src/Makefile.am +++ b/gettext-tools/src/Makefile.am @@ -83,7 +83,8 @@ DEFS = \ -DGETTEXTJAR=\"$(jardir)/gettext.jar\" \ -DLIBDIR=\"$(libdir)\" \ -DGETTEXTDATADIR=\"$(pkgdatadir)\" \ - -DPROJECTSDIR=\"$(projectsdir)\" @DEFS@ + -DPROJECTSDIR=\"$(projectsdir)\" \ + -DEXEEXT=\"@EXEEXT@\" @DEFS@ # Ensure that defines SIZE_MAX in C++ mode, like it does in C mode. AM_CXXFLAGS = -D__STDC_LIMIT_MACROS diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c index 0098bc74a..889bd4662 100644 --- a/gettext-tools/src/msginit.c +++ b/gettext-tools/src/msginit.c @@ -1365,7 +1365,7 @@ plural_forms () if (gettextlibdir == NULL || gettextlibdir[0] == '\0') gettextlibdir = relocate (LIBDIR "/gettext"); - prog = xconcatenated_filename (gettextlibdir, "cldr-plurals", NULL); + prog = xconcatenated_filename (gettextlibdir, "cldr-plurals", EXEEXT); last_dir = xstrdup (gettextcldrdir); dirs[0] = "common"; -- 2.47.3