Improve support of Hunspell

Artur Zakirov · Artur Zakirov · commit 1e782195fe20 · 2016-03-18T16:34:04.000+03:00
diff --git a/src/backend/tsearch/Makefile b/src/backend/tsearch/Makefile
@@ -14,10 +14,15 @@ 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
+# 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,8 +32,8 @@ 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)/'
+install-data: $(DICTFILES_PATH) installdirs
+	$(INSTALL_DATA) $(addprefix $(srcdir)/,$(DICTFILES_PATH)) '$(DESTDIR)$(datadir)/$(DICTDIR)/'
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(datadir)' '$(DESTDIR)$(datadir)/$(DICTDIR)'
diff --git a/src/backend/tsearch/dicts/hunspell_sample.affix b/src/backend/tsearch/dicts/hunspell_sample.affix
@@ -21,4 +21,3 @@ SFX A   Y	IES	[^AEIOU]Y
 
 SFX \ N 1
 SFX \   0	Y/L	[^Y]
-
diff --git a/src/backend/tsearch/dicts/hunspell_sample_long.affix b/src/backend/tsearch/dicts/hunspell_sample_long.affix
@@ -32,4 +32,3 @@ SFX sA   Y	IES	[^AEIOU]Y
 
 SFX s\ N 1
 SFX s\   0	Y/2	[^Y]
-
diff --git a/src/backend/tsearch/dicts/hunspell_sample_num.affix b/src/backend/tsearch/dicts/hunspell_sample_num.affix
@@ -23,4 +23,3 @@ SFX 304   Y	IES	[^AEIOU]Y
 
 SFX 305 N 1
 SFX 305   0	Y/102	[^Y]
-
diff --git a/src/backend/tsearch/spell.c b/src/backend/tsearch/spell.c
diff --git a/src/include/tsearch/dicts/spell.h b/src/include/tsearch/dicts/spell.h

Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,3 @@ SFX A Y IES [^AEIOU]Y`
`21`	`21`
`22`	`22`	`SFX \ N 1`
`23`	`23`	`SFX \ 0 Y/L [^Y]`
`24`		`-`
Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,3 @@ SFX sA Y IES [^AEIOU]Y`
`32`	`32`
`33`	`33`	`SFX s\ N 1`
`34`	`34`	`SFX s\ 0 Y/2 [^Y]`
`35`		`-`
Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,3 @@ SFX 304 Y IES [^AEIOU]Y`
`23`	`23`
`24`	`24`	`SFX 305 N 1`
`25`	`25`	`SFX 305 0 Y/102 [^Y]`
`26`		`-`