Kouhei Sutou
null+****@clear*****
Wed Oct 10 10:07:35 JST 2012
Kouhei Sutou 2012-10-10 10:07:35 +0900 (Wed, 10 Oct 2012) New Revision: 07189af61e8536106951690a927dbcc49c225dfc https://github.com/groonga/groonga/commit/07189af61e8536106951690a927dbcc49c225dfc Log: Add pluginsdir variable to .pc Modified files: CMakeLists.txt configure.ac groonga.pc.in Modified: CMakeLists.txt (+1 -0) =================================================================== --- CMakeLists.txt 2012-10-10 09:58:20 +0900 (ab45ffc) +++ CMakeLists.txt 2012-10-10 10:07:35 +0900 (78a8a55) @@ -334,6 +334,7 @@ set(libdir "${LIB_DIR}") set(includedir "${INCLUDE_DIR}") set(datarootdir "${DATA_DIR}") set(datadir "${datarootdir}") +set(expanded_pluginsdir "${GRN_PLUGINS_DIR}") set(GRN_EXPANDED_DEFAULT_DOCUMENT_ROOT "${GRN_DEFAULT_DOCUMENT_ROOT}") set(EXEEXT "${CMAKE_EXECUTABLE_SUFFIX}") configure_file(groonga.pc.in ${CMAKE_CURRENT_BINARY_DIR}/groonga.pc @ONLY) Modified: configure.ac (+4 -0) =================================================================== --- configure.ac 2012-10-10 09:58:20 +0900 (9f56ece) +++ configure.ac 2012-10-10 10:07:35 +0900 (ff298f7) @@ -1148,9 +1148,13 @@ AM_CONDITIONAL([FEDORA_PLATFORM], # plugins check relative_pluginsdir="\$(PACKAGE)/plugins" AC_SUBST(relative_pluginsdir) +expanded_relative_pluginsdir="${PACKAGE}/plugins" +AC_SUBST(expanded_relative_pluginsdir) pluginsdir="\${libdir}/\$(relative_pluginsdir)" AC_SUBST(pluginsdir) +expanded_pluginsdir="\${libdir}/${expanded_relative_pluginsdir}" +AC_SUBST(expanded_pluginsdir) tokenizers_pluginsdir="\${pluginsdir}/tokenizers" AC_SUBST(tokenizers_pluginsdir) Modified: groonga.pc.in (+1 -0) =================================================================== --- groonga.pc.in 2012-10-10 09:58:20 +0900 (e1060ad) +++ groonga.pc.in 2012-10-10 10:07:35 +0900 (a98e063) @@ -6,6 +6,7 @@ includedir=@includedir@ datarootdir=@datarootdir@ datadir=@datadir@ document_root=@GRN_EXPANDED_DEFAULT_DOCUMENT_ROOT@ +pluginsdir=@expanded_pluginsdir@ groonga=${bindir}/groonga �� EXEEXT@ groonga_suggest_create_dataset=${bindir}/groonga-suggest-create-dataset �� EXEEXT@ groonga_version=@GRN_VERSION@ -------------- next part -------------- HTML����������������������������...Download