From c5ed014df578f2be4c48ac8e6f09d6450d1a2a03 Mon Sep 17 00:00:00 2001 From: rezso Date: Mon, 19 May 2014 09:23:35 +0100 Subject: [PATCH] lucene++ .pc files fix Upstream: Committed: References: https://github.com/luceneplusplus/LucenePlusPlus/commit/c5ed014df578f2be4c48ac8e6f09d6450d1a2a03 Without this patch, liblucene++-contrib.pc contains: > Requires: liblucene++=3.0.6 Which breaks pkg-config: > $ pkg-config --libs liblucene++-contrib > Package liblucene++=3.0.6 was not found in the pkg-config search path. > Perhaps you should add the directory containing `liblucene++=3.0.6.pc' > to the PKG_CONFIG_PATH environment variable > Package 'liblucene++=3.0.6', required by 'liblucene++-contrib', not found The correct line is: > Requires: liblucene++ = 3.0.6 Which returns correctly: > $ pkg-config --libs liblucene++-contrib > -L/usr/lib/ -llucene++-contrib -llucene++ --- liblucene++-contrib.pc.cmake | 7 +++---- liblucene++.pc.cmake | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/liblucene++-contrib.pc.cmake b/liblucene++-contrib.pc.cmake index 3ebf9f9..98b6381 100644 --- a/liblucene++-contrib.pc.cmake +++ b/liblucene++-contrib.pc.cmake @@ -1,14 +1,13 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix}/bin -libdir=@LIB_DESTINATION@ +libdir=${prefix}/@LIB_DESTINATION@ includedir=${prefix}/include/lucene++ lib=lucene++-contrib Name: liblucene++-contrib Description: Contributions for Lucene++ - a C++ search engine, ported from the popular Apache Lucene Version: @lucene++_VERSION@ -Libs: -L@LIB_DESTINATION@/ -l${lib} +Libs: -L${prefix}/@LIB_DESTINATION@ -l${lib} Cflags: -I${includedir} -Requires: liblucene++=@lucene++_VERSION@ -~ +Requires: liblucene++ = @lucene++_VERSION@ diff --git a/liblucene++.pc.cmake b/liblucene++.pc.cmake index d238e51..c526d4a 100644 --- a/liblucene++.pc.cmake +++ b/liblucene++.pc.cmake @@ -1,13 +1,12 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix}/bin -libdir=@LIB_DESTINATION@ +libdir=${prefix}/@LIB_DESTINATION@ includedir=${prefix}/include/lucene++ lib=lucene++ Name: liblucene++ Description: Lucene++ - a C++ search engine, ported from the popular Apache Lucene Version: @lucene++_VERSION@ -Libs: -L@LIB_DESTINATION@ -l${lib} +Libs: -L${prefix}/@LIB_DESTINATION@ -l${lib} Cflags: -I${includedir} -~