From 1c2db8c305745edb8800e8b146d5c295eb82a4fd Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 7 Mar 2016 20:36:59 -0500 Subject: [PATCH] Fix uninstall target in tsearch Makefile Artur Zakirov --- src/backend/tsearch/Makefile | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/backend/tsearch/Makefile b/src/backend/tsearch/Makefile index 21d209ae14..7a0ec0cc97 100644 --- a/src/backend/tsearch/Makefile +++ b/src/backend/tsearch/Makefile @@ -13,11 +13,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 +31,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)' -- 2.40.0