[libkml] 07/13: Add patch to fix pkgconfig install path.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sun Aug 2 21:09:02 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository libkml.
commit 2f5ab6c6233dd24038c28ade34210d1c9af85daa
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Aug 2 18:09:21 2015 +0200
Add patch to fix pkgconfig install path.
---
debian/changelog | 1 +
debian/patches/pkgconfig-install-path.patch | 26 ++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 28 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index ee0c9f4..e76323e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libkml (1.3.0~rc0-1) UNRELEASED; urgency=medium
* New upstream release candidate.
* Drop patches, applied upstream.
* Update symbols for amd64.
+ * Add patch to fix pkgconfig install path.
-- Bas Couwenberg <sebastic at debian.org> Sun, 02 Aug 2015 17:40:59 +0200
diff --git a/debian/patches/pkgconfig-install-path.patch b/debian/patches/pkgconfig-install-path.patch
new file mode 100644
index 0000000..3cf5e9c
--- /dev/null
+++ b/debian/patches/pkgconfig-install-path.patch
@@ -0,0 +1,26 @@
+Description: Fix pkgconfig install path (<prefix>/lib/pkgconfig)
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/libkml/libkml/pull/203
+Applied-Upstream: https://github.com/libkml/libkml/commit/8ba168a477696de292ca9614eb837a9283a24707
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -52,6 +52,9 @@ endif(NOT DEFINED LOCALE_INSTALL_DIR)
+ if(NOT DEFINED JAVA_INSTALL_DIR)
+ set(JAVA_INSTALL_DIR "${DATA_INSTALL_DIR}/java")
+ endif(NOT DEFINED JAVA_INSTALL_DIR)
++if(NOT DEFINED PKGCONFIG_INSTALL_DIR)
++ set(PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig")
++endif(NOT DEFINED PKGCONFIG_INSTALL_DIR)
+
+ # Path to additional CMake modules
+ set(CMAKE_MODULE_PATH
+@@ -131,7 +134,7 @@ configure_file("${CMAKE_SOURCE_DIR}/cmak
+ "${CMAKE_BINARY_DIR}/libkml.pc" @ONLY)
+
+ install(FILES ${CMAKE_BINARY_DIR}/libkml.pc
+- DESTINATION ${DATA_INSTALL_DIR})
++ DESTINATION ${PKGCONFIG_INSTALL_DIR})
+
+ if(BUILD_TESTING)
+ enable_testing()
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..877582d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+pkgconfig-install-path.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libkml.git
More information about the Pkg-grass-devel
mailing list