Kouhei Sutou
null+****@clear*****
Wed Jun 26 16:42:25 JST 2013
Kouhei Sutou 2013-06-26 16:42:25 +0900 (Wed, 26 Jun 2013) New Revision: 98678bb8ca93bda670a545e406eeabe471a98454 https://github.com/groonga/groonga/commit/98678bb8ca93bda670a545e406eeabe471a98454 Message: Add "lib/" to GRN_RELATIVE_PLUGINS_DIR Modified files: configure.ac lib/plugin.c Modified: configure.ac (+9 -7) =================================================================== --- configure.ac 2013-06-26 16:26:10 +0900 (6fa83d6) +++ configure.ac 2013-06-26 16:42:25 +0900 (cb10850) @@ -1157,14 +1157,16 @@ AM_CONDITIONAL([FEDORA_PLATFORM], [test "${package_platform}" = "fedora"]) # plugins check -relative_pluginsdir="\$(PACKAGE)/plugins" -AC_SUBST(relative_pluginsdir) -expanded_relative_pluginsdir="${PACKAGE}/plugins" -AC_SUBST(expanded_relative_pluginsdir) +relative_pluginsdir_base="\$(PACKAGE)/plugins" +AC_SUBST(relative_pluginsdir_base) +expanded_relative_pluginsdir_base="${PACKAGE}/plugins" +AC_SUBST(expanded_relative_pluginsdir_base) -pluginsdir="\${libdir}/\$(relative_pluginsdir)" +relative_pluginsdir="lib/\$(relative_pluginsdir_base)" + +pluginsdir="\${libdir}/\$(relative_pluginsdir_base)" AC_SUBST(pluginsdir) -expanded_pluginsdir="\${libdir}/${expanded_relative_pluginsdir}" +expanded_pluginsdir="\${libdir}/${expanded_relative_pluginsdir_base}" AC_SUBST(expanded_pluginsdir) tokenizers_pluginsdir="\${pluginsdir}/tokenizers" @@ -1224,7 +1226,7 @@ AC_SUBST(GRN_CFLAGS) GRN_DEFS="" GRN_DEFS="$GRN_DEFS -DGRN_DLL_FILENAME=L\\\"\"\$(GRN_DLL_FILENAME)\"\\\"" GRN_DEFS="$GRN_DEFS -DGRN_PLUGINS_DIR=\\\"\"\$(pluginsdir)\"\\\"" -GRN_DEFS="$GRN_DEFS -DGRN_RELATIVE_PLUGINS_DIR=\\\"\"lib/\$(relative_pluginsdir)\"\\\"" +GRN_DEFS="$GRN_DEFS -DGRN_RELATIVE_PLUGINS_DIR=\\\"\"\$(relative_pluginsdir)\"\\\"" GRN_DEFS="$GRN_DEFS -DGRN_LOG_PATH=\\\"\"\$(grn_log_path)\"\\\"" GRN_DEFS="$GRN_DEFS -DGRN_DEFAULT_DOCUMENT_ROOT=\\\"\"\$(GRN_DEFAULT_DOCUMENT_ROOT)\"\\\"" GRN_DEFS="$GRN_DEFS -DGRN_DEFAULT_RELATIVE_DOCUMENT_ROOT=\\\"\"\$(GRN_DEFAULT_RELATIVE_DOCUMENT_ROOT)\"\\\"" Modified: lib/plugin.c (+1 -1) =================================================================== --- lib/plugin.c 2013-06-26 16:26:10 +0900 (a16fa55) +++ lib/plugin.c 2013-06-26 16:42:25 +0900 (9afafb7) @@ -338,7 +338,7 @@ grn_plugin_get_system_plugins_dir(void) base_dir = grn_win32_base_dir(); base_dir_length = strlen(base_dir); strcpy(win32_plugins_dir_buffer, base_dir); - strcat(win32_plugins_dir_buffer, "/lib/"); + strcat(win32_plugins_dir_buffer, "/"); strcat(win32_plugins_dir_buffer, relative_path); win32_plugins_dir = win32_plugins_dir_buffer; } -------------- next part -------------- HTML����������������������������...Download