--- hunspell-1.2.14/src/tools/hunspell.cxx.alt 2011-01-06 15:31:27.000000000 +0300 +++ hunspell-1.2.14/src/tools/hunspell.cxx 2011-01-30 19:53:07.000000000 +0300 @@ -60,29 +60,8 @@ #include "manparser.hxx" #include "firstparser.hxx" -#define LIBDIR \ - "/usr/share/hunspell:" \ - "/usr/share/myspell:" \ - "/usr/share/myspell/dicts:" \ - "/Library/Spelling" -#define USEROOODIR \ - ".openoffice.org/3/user/wordbook:" \ - ".openoffice.org2/user/wordbook:" \ - ".openoffice.org2.0/user/wordbook:" \ - "Library/Spelling" -#define OOODIR \ - "/opt/openoffice.org/basis3.0/share/dict/ooo:" \ - "/usr/lib/openoffice.org/basis3.0/share/dict/ooo:" \ - "/opt/openoffice.org2.4/share/dict/ooo:" \ - "/usr/lib/openoffice.org2.4/share/dict/ooo:" \ - "/opt/openoffice.org2.3/share/dict/ooo:" \ - "/usr/lib/openoffice.org2.3/share/dict/ooo:" \ - "/opt/openoffice.org2.2/share/dict/ooo:" \ - "/usr/lib/openoffice.org2.2/share/dict/ooo:" \ - "/opt/openoffice.org2.1/share/dict/ooo:" \ - "/usr/lib/openoffice.org2.1/share/dict/ooo:" \ - "/opt/openoffice.org2.0/share/dict/ooo:" \ - "/usr/lib/openoffice.org2.0/share/dict/ooo" +#define LIBDIR "/usr/share/hunspell:/usr/share/myspell" +#define USEROOODIR ".config/libreoffice/user/wordbook" #define HOME getenv("HOME") #define DICBASENAME ".hunspell_" #define LOGFILE "/tmp/hunspell.log" @@ -1661,7 +1640,6 @@ int main(int argc, char** argv) if (getenv("DICPATH")) path = add(add(path, getenv("DICPATH")), PATHSEP); path = add(add(path, LIBDIR), PATHSEP); if (HOME) path = add(add(add(add(path, HOME), DIRSEP), USEROOODIR), PATHSEP); - path = add(path, OOODIR); if (showpath) { fprintf(stderr, gettext("SEARCH PATH:\n%s\n"), path);