Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Add pluginsdir variable to .pc

  • Loading branch information...
commit 07189af61e8536106951690a927dbcc49c225dfc 1 parent 8050c54
@kou kou authored
Showing with 6 additions and 0 deletions.
  1. +1 −0  CMakeLists.txt
  2. +4 −0 configure.ac
  3. +1 −0  groonga.pc.in
View
1  CMakeLists.txt
@@ -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)
View
4 configure.ac
@@ -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)
View
1  groonga.pc.in
@@ -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@
Please sign in to comment.
Something went wrong with that request. Please try again.