Repository: arrow Updated Branches: refs/heads/master c5a89b7b4 -> fe9c7ef50
ARROW-1236: Fix lib path in pkg-config file The `CMAKE_INSTALL_LIBDIR` already contains the prefix on a default installation (such as in the conda-forge package) and therefore prepending the prefix results in the wrong path. While apparently it is not clear what this variable should be (https://bugzilla.redhat.com/show_bug.cgi?id=795542), it seems that it's used as an absolute path in the rest of the project. Author: Zahari <[email protected]> Closes #866 from Zaharid/fixpc and squashes the following commits: 231238c [Zahari] Use better cmake variables 4d1c69a [Zahari] Fix lib path in pkg-config file Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/fe9c7ef5 Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/fe9c7ef5 Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/fe9c7ef5 Branch: refs/heads/master Commit: fe9c7ef50e54354d9037a3175214365c8cc7d85f Parents: c5a89b7 Author: Zahari <[email protected]> Authored: Wed Jul 19 10:08:27 2017 +0900 Committer: Kouhei Sutou <[email protected]> Committed: Wed Jul 19 10:08:27 2017 +0900 ---------------------------------------------------------------------- cpp/src/arrow/arrow.pc.in | 5 ++--- cpp/src/arrow/python/arrow-python.pc.in | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/fe9c7ef5/cpp/src/arrow/arrow.pc.in ---------------------------------------------------------------------- diff --git a/cpp/src/arrow/arrow.pc.in b/cpp/src/arrow/arrow.pc.in index 0debee3..fc16267 100644 --- a/cpp/src/arrow/arrow.pc.in +++ b/cpp/src/arrow/arrow.pc.in @@ -15,9 +15,8 @@ # specific language governing permissions and limitations # under the License. -prefix=@CMAKE_INSTALL_PREFIX@ -libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -includedir=${prefix}/include +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ so_version=@ARROW_SO_VERSION@ abi_version=@ARROW_ABI_VERSION@ http://git-wip-us.apache.org/repos/asf/arrow/blob/fe9c7ef5/cpp/src/arrow/python/arrow-python.pc.in ---------------------------------------------------------------------- diff --git a/cpp/src/arrow/python/arrow-python.pc.in b/cpp/src/arrow/python/arrow-python.pc.in index 11e33c5..5293951 100644 --- a/cpp/src/arrow/python/arrow-python.pc.in +++ b/cpp/src/arrow/python/arrow-python.pc.in @@ -15,9 +15,8 @@ # specific language governing permissions and limitations # under the License. -prefix=@CMAKE_INSTALL_PREFIX@ -libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -includedir=${prefix}/include +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ Name: Apache Arrow Python Description: Python integration library for Apache Arrow
