From: Teemu Huovila <teemu.huovila@dovecot.fi>
Date: Mon, 30 May 2016 08:54:26 +0000 (+0300)
Subject: lib-fts: Move stopwords to subdirectory.
X-Git-Tag: 2.2.25.rc1~222
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7021f4200bce3cca050a35b8d0aa51f46456dc5;p=thirdparty%2Fdovecot%2Fcore.git

lib-fts: Move stopwords to subdirectory.

All files incluided in dist are explicitly mentioned. The whole
subdirectory 'stopwords' could also be distributed, but that is
more error prone.
---

diff --git a/src/lib-fts/Makefile.am b/src/lib-fts/Makefile.am
index fa04b2bad0..fb19956eb7 100644
--- a/src/lib-fts/Makefile.am
+++ b/src/lib-fts/Makefile.am
@@ -12,15 +12,15 @@ AM_CPPFLAGS = \
 	$(LIBICU_CFLAGS) \
 	-DUDHRDIR=\""$(top_srcdir)/src/lib-fts"\" \
 	-DDATADIR=\"$(pkgdatadir)\" \
-	-DTEST_STOPWORDS_DIR=\""$(top_srcdir)/src/lib-fts"\"
+	-DTEST_STOPWORDS_DIR=\""$(top_srcdir)/src/lib-fts/stopwords"\"
 
 stopwordsdir = $(datadir)/${PACKAGE_TARNAME}/stopwords
 dist_stopwords_DATA = \
-	stopwords_en.txt \
-	stopwords_fi.txt \
-	stopwords_fr.txt \
-	stopwords_no.txt \
-	stopwords_sv.txt
+	stopwords/stopwords_en.txt \
+	stopwords/stopwords_fi.txt \
+	stopwords/stopwords_fr.txt \
+	stopwords/stopwords_no.txt \
+	stopwords/stopwords_sv.txt
 
 BUILT_SOURCES = word-boundary-data.c word-break-data.c
 
diff --git a/src/lib-fts/stopwords_en.txt b/src/lib-fts/stopwords/stopwords_en.txt
similarity index 100%
rename from src/lib-fts/stopwords_en.txt
rename to src/lib-fts/stopwords/stopwords_en.txt
diff --git a/src/lib-fts/stopwords_fi.txt b/src/lib-fts/stopwords/stopwords_fi.txt
similarity index 100%
rename from src/lib-fts/stopwords_fi.txt
rename to src/lib-fts/stopwords/stopwords_fi.txt
diff --git a/src/lib-fts/stopwords_fr.txt b/src/lib-fts/stopwords/stopwords_fr.txt
similarity index 100%
rename from src/lib-fts/stopwords_fr.txt
rename to src/lib-fts/stopwords/stopwords_fr.txt
diff --git a/src/lib-fts/stopwords_no.txt b/src/lib-fts/stopwords/stopwords_no.txt
similarity index 100%
rename from src/lib-fts/stopwords_no.txt
rename to src/lib-fts/stopwords/stopwords_no.txt
diff --git a/src/lib-fts/stopwords_sv.txt b/src/lib-fts/stopwords/stopwords_sv.txt
similarity index 100%
rename from src/lib-fts/stopwords_sv.txt
rename to src/lib-fts/stopwords/stopwords_sv.txt