On 07.03.2016 17:49, Peter Eisentraut wrote:
On 3/4/16 12:08 PM, Teodor Sigaev wrote:
Improve support of Hunspell in ispell dictionary.
Now it's possible to load recent version of Hunspell for several languages.
To handle these dictionaries Hunspell patch adds support for:
* FLAG long - sets the double extended ASCII character flag type
* FLAG num - sets the decimal number flag type (from 1 to 65535)
* AF parameter - alias for flag's set
Also it moves test dictionaries into separate directory.
The uninstall target in src/backend/tsearch/Makefile doesn't work
anymore, because it tries to uninstall from, e.g.,
share/tsearch_data/dicts/hunspell_sample_long.dict, but the files are at
share/tsearch_data/dicts/hunspell_sample_long.dict .
Thank you for notice that. Indeed. It is my fault.
Attached patch should fix it.
--
Artur Zakirov
Postgres Professional: http://www.postgrespro.com
Russian Postgres Company
*** a/src/backend/tsearch/Makefile
--- b/src/backend/tsearch/Makefile
***************
*** 13,23 **** include $(top_builddir)/src/Makefile.global
DICTDIR=tsearch_data
! DICTFILES=dicts/synonym_sample.syn dicts/thesaurus_sample.ths \
! dicts/hunspell_sample.affix \
! dicts/ispell_sample.affix dicts/ispell_sample.dict \
! dicts/hunspell_sample_long.affix dicts/hunspell_sample_long.dict \
! dicts/hunspell_sample_num.affix dicts/hunspell_sample_num.dict
OBJS = ts_locale.o ts_parse.o wparser.o wparser_def.o dict.o \
dict_simple.o dict_synonym.o dict_thesaurus.o \
--- 13,27 ----
DICTDIR=tsearch_data
! # List of dictionaries files
! DICTFILES=synonym_sample.syn thesaurus_sample.ths \
! hunspell_sample.affix \
! ispell_sample.affix ispell_sample.dict \
! hunspell_sample_long.affix hunspell_sample_long.dict \
! hunspell_sample_num.affix hunspell_sample_num.dict
!
! # Local paths to dictionaries files
! DICTFILES_PATH=$(addprefix dicts/,$(DICTFILES))
OBJS = ts_locale.o ts_parse.o wparser.o wparser_def.o dict.o \
dict_simple.o dict_synonym.o dict_thesaurus.o \
***************
*** 27,34 **** OBJS = ts_locale.o ts_parse.o wparser.o wparser_def.o dict.o \
include $(top_srcdir)/src/backend/common.mk
.PHONY: install-data
! install-data: $(DICTFILES) installdirs
! $(INSTALL_DATA) $(addprefix $(srcdir)/,$(DICTFILES)) '$(DESTDIR)$(datadir)/$(DICTDIR)/'
installdirs:
$(MKDIR_P) '$(DESTDIR)$(datadir)' '$(DESTDIR)$(datadir)/$(DICTDIR)'
--- 31,38 ----
include $(top_srcdir)/src/backend/common.mk
.PHONY: install-data
! install-data: $(DICTFILES_PATH) installdirs
! $(INSTALL_DATA) $(addprefix $(srcdir)/,$(DICTFILES_PATH)) '$(DESTDIR)$(datadir)/$(DICTDIR)/'
installdirs:
$(MKDIR_P) '$(DESTDIR)$(datadir)' '$(DESTDIR)$(datadir)/$(DICTDIR)'
--
Sent via pgsql-committers mailing list ([email protected])
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-committers
