forked from pool/lucene__
Jan Engelhardt
8436ef52f6
- Update to version 3.0.8: * No changelog provided. - Remove 0001-Fix-compilation-with-Boost-1.58.patch: Merged upstream. - Add some patches from upstream, mainly build system fixes: * lucene++-3.0.8-fix-contrib-soname.patch * lucene++-3.0.8-fix-pc-libdir.patch * lucene++-3.0.8-fix-cmake-issues.patch - Require CMake >= 3.5 to build. - Run test suite on build. - Add new cmake files to list of installed files. OBS-URL: https://build.opensuse.org/request/show/863899 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/lucene++?expand=0&rev=12
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From 39cd44bd54e918d25ee464477992ad0dc234dcba Mon Sep 17 00:00:00 2001
|
|
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
|
|
Date: Mon, 4 Jan 2021 16:29:25 +0100
|
|
Subject: [PATCH] pkgconfig: use correct LIBDIR for destination library
|
|
|
|
---
|
|
src/config/contrib/liblucene++-contrib.pc.in | 4 ++--
|
|
src/config/core/liblucene++.pc.in | 4 ++--
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/config/contrib/liblucene++-contrib.pc.in b/src/config/contrib/liblucene++-contrib.pc.in
|
|
index 21026e0a..64c3acac 100644
|
|
--- a/src/config/contrib/liblucene++-contrib.pc.in
|
|
+++ b/src/config/contrib/liblucene++-contrib.pc.in
|
|
@@ -1,13 +1,13 @@
|
|
prefix=@CMAKE_INSTALL_PREFIX@
|
|
exec_prefix=${prefix}/bin
|
|
-libdir=@LIB_DESTINATION@
|
|
+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
|
|
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${libdir} -l${lib}
|
|
Cflags: -I${includedir}
|
|
Requires: liblucene++ = @lucene++_VERSION@
|
|
|
|
diff --git a/src/config/core/liblucene++.pc.in b/src/config/core/liblucene++.pc.in
|
|
index 32d16ad7..690f7d24 100644
|
|
--- a/src/config/core/liblucene++.pc.in
|
|
+++ b/src/config/core/liblucene++.pc.in
|
|
@@ -1,12 +1,12 @@
|
|
prefix=@CMAKE_INSTALL_PREFIX@
|
|
exec_prefix=${prefix}/bin
|
|
-libdir=@LIB_DESTINATION@
|
|
+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
|
|
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${libdir} -l${lib}
|
|
Cflags: -I${includedir}
|
|
|