Kouhei Sutou
null+****@clear*****
Sun May 22 16:38:06 JST 2016
Kouhei Sutou 2016-05-22 16:38:06 +0900 (Sun, 22 May 2016) New Revision: 9fc915d4cd121041b594f6a7df23de7bf8690e52 https://github.com/groonga/groonga/commit/9fc915d4cd121041b594f6a7df23de7bf8690e52 Message: windows query_expanders/tsv: fix default path Modified files: CMakeLists.txt configure.ac plugins/query_expanders/tsv.c Modified: CMakeLists.txt (+3 -2) =================================================================== --- CMakeLists.txt 2016-05-22 16:32:42 +0900 (0b5033d) +++ CMakeLists.txt 2016-05-22 16:38:06 +0900 (a71b1ee) @@ -132,9 +132,10 @@ set(GRN_PLUGINS_DIR set(GRN_PLUGIN_SUFFIX "${CMAKE_SHARED_MODULE_SUFFIX}") set(GRN_DLL_FILENAME "${CMAKE_SHARED_LIBRARY_PREFIX}groonga${CMAKE_SHARED_LIBRARY_SUFFIX}") -set(GRN_QUERY_EXPANDER_TSV_RELATIVE_SYNONYMS_FILE "synonyms.tsv") +set(GRN_QUERY_EXPANDER_TSV_RELATIVE_SYNONYMS_FILE + "${GRN_CONFIG_DIR}/synonyms.tsv") set(GRN_QUERY_EXPANDER_TSV_SYNONYMS_FILE - "${CMAKE_INSTALL_PREFIX}/${GRN_DATA_DIR}/${GRN_QUERY_EXPANDER_TSV_RELATIVE_SYNONYMS_FILE}") + "${CMAKE_INSTALL_PREFIX}/${GRN_QUERY_EXPANDER_TSV_RELATIVE_SYNONYMS_FILE}") set(GRN_RELATIVE_RUBY_SCRIPTS_DIR "${LIB_DIR}/${GRN_PROJECT_NAME}/scripts/ruby") set(GRN_RUBY_SCRIPTS_DIR Modified: configure.ac (+3 -2) =================================================================== --- configure.ac 2016-05-22 16:32:42 +0900 (0c53914) +++ configure.ac 2016-05-22 16:38:06 +0900 (724337d) @@ -1449,12 +1449,13 @@ fi AC_DEFINE_UNQUOTED(GRN_PLUGIN_SUFFIX, ["$suffix"], "plugin suffix") # for query expanders -GRN_QUERY_EXPANDER_TSV_RELATIVE_SYNONYMS_FILE="synonyms.tsv" +GRN_QUERY_EXPANDER_TSV_RELATIVE_SYNONYMS_FILE_BASE="synonyms.tsv" +GRN_QUERY_EXPANDER_TSV_RELATIVE_SYNONYMS_FILE="etc/${PACKAGE}/${GRN_QUERY_EXPANDER_TSV_RELATIVE_SYNONYMS_FILE_BASE}" AC_DEFINE_UNQUOTED(GRN_QUERY_EXPANDER_TSV_RELATIVE_SYNONYMS_FILE, ["$GRN_QUERY_EXPANDER_TSV_RELATIVE_SYNONYMS_FILE"], "The relative synonyms file for TSV query expander") GRN_QUERY_EXPANDER_TSV_SYNONYMS_PATH="` - eval echo ${sysconfdir}/${PACKAGE}/${GRN_QUERY_EXPANDER_TSV_RELATIVE_SYNONYMS_FILE} + eval echo ${sysconfdir}/${PACKAGE}/${GRN_QUERY_EXPANDER_TSV_RELATIVE_SYNONYMS_FILE_BASE} `" AC_DEFINE_UNQUOTED(GRN_QUERY_EXPANDER_TSV_SYNONYMS_FILE, ["$GRN_QUERY_EXPANDER_TSV_SYNONYMS_PATH"], Modified: plugins/query_expanders/tsv.c (+1 -1) =================================================================== --- plugins/query_expanders/tsv.c 2016-05-22 16:32:42 +0900 (478fa44) +++ plugins/query_expanders/tsv.c 2016-05-22 16:38:06 +0900 (2b0a5ba) @@ -47,7 +47,7 @@ get_system_synonyms_file(void) const char *relative_path = GRN_QUERY_EXPANDER_TSV_RELATIVE_SYNONYMS_FILE; size_t base_dir_length; - base_dir = grn_plugin_win32_base_dir(); + base_dir = grn_plugin_windows_base_dir(); base_dir_length = strlen(base_dir); grn_strcpy(win32_synonyms_file, MAX_PATH, base_dir); grn_strcat(win32_synonyms_file, MAX_PATH, "/"); -------------- next part -------------- HTML����������������������������...下载
