i686-w64-mingw32/gettext/0003-move-cldr-plurals.patch

0001 --- a/gettext-tools/src/msginit.c       Fri Jul 08 12:08:39 2016
0002 +++ b/gettext-tools/src/msginit.c       Fri Jul 08 12:07:27 2016
0003 @@ -1140,26 +1140,31 @@
0004        return plural_table[i].value;
0005
0006    gettextcldrdir = getenv ("GETTEXTCLDRDIR");
0007    if (gettextcldrdir != NULL && gettextcldrdir[0] != '\0')
0008      {
0009 -      const char *gettextlibdir;
0010 +      char *gettextbindir;
0011        char *dirs[3], *last_dir;
0012        char *argv[4];
0013        pid_t child;
0014        int fd[1];
0015        FILE *fp;
0016        char *line;
0017        size_t linesize;
0018        size_t linelen;
0019        int exitstatus;
0020
0021 -      gettextlibdir = getenv ("GETTEXTLIBDIR");
0022 -      if (gettextlibdir == NULL || gettextlibdir[0] == '\0')
0023 -        gettextlibdir = relocate (LIBDIR "/gettext");
0024 +      gettextbindir = xstrdup(program_name);
0025 +      for (i = strlen(gettextbindir) - 1; i >= 0; i--) {
0026 +        if (gettextbindir[i] == '/' || gettextbindir[i] == '\\') {
0027 +          gettextbindir[i + 1] = '\0';
0028 +          break;
0029 +        }
0030 +      }
0031
0032 -      prog = xconcatenated_filename (gettextlibdir, "cldr-plurals", NULL);
0033 +      prog = xconcatenated_filename (gettextbindir, "cldr-plurals.exe", NULL);
0034 +      free(gettextbindir);
0035
0036        last_dir = xstrdup (gettextcldrdir);
0037        dirs[0] = "common";
0038        dirs[1] = "supplemental";
0039        dirs[2] = "plurals.xml";