[libfann] 17/34: Add patch cmake-Configurable-pkgconfig-install-destination.patch

[Christian Kastner]

This is an automated email from the git hooks/post-receive script.

chrisk-guest pushed a commit to branch master
in repository libfann.

commit 6fb24acff31e96fa4e14fb9699c21aa2f562019d
Author: Christian Kastner <ckk at kvr.at>
Date:   Thu Oct 1 11:32:52 2015 +0200

    Add patch cmake-Configurable-pkgconfig-install-destination.patch
---
 ...onfigurable-pkgconfig-install-destination.patch | 48 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 49 insertions(+)

diff --git a/debian/patches/cmake-Configurable-pkgconfig-install-destination.patch b/debian/patches/cmake-Configurable-pkgconfig-install-destination.patch
new file mode 100644
index 0000000..411a1df
--- /dev/null
+++ b/debian/patches/cmake-Configurable-pkgconfig-install-destination.patch
@@ -0,0 +1,48 @@
+From: Christian Kastner <ckk at debian.org>
+Date: Fri, 25 Sep 2015 10:39:42 +0200
+Subject: cmake: Configurable pkgconfig install destination
+
+Don't hard-code the destination; allow it to be overrridden, just as for the
+other targets.
+
+Forwarded: not-needed
+Last-Update: 2015-09-25
+---
+ CMakeLists.txt                              | 4 +---
+ cmake/Modules/DefineInstallationPaths.cmake | 6 ++++++
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b91f6fb..68bf7c4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,11 +16,9 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/src/include/)
+ 
+ configure_file( ${CMAKE_SOURCE_DIR}/cmake/fann.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/fann.pc @ONLY )
+ 
+-SET(PKGCONFIG_INSTALL_DIR /lib/pkgconfig)
+-
+ ########### install files ###############
+ 
+-INSTALL_FILES( ${PKGCONFIG_INSTALL_DIR} FILES  fann.pc )
++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/fann.pc DESTINATION ${PKGCONFIG_INSTALL_DIR} )
+ 
+ ADD_SUBDIRECTORY( src ) 
+ 
+diff --git a/cmake/Modules/DefineInstallationPaths.cmake b/cmake/Modules/DefineInstallationPaths.cmake
+index 644cf1b..2c8e0a4 100644
+--- a/cmake/Modules/DefineInstallationPaths.cmake
++++ b/cmake/Modules/DefineInstallationPaths.cmake
+@@ -45,6 +45,12 @@ if (UNIX)
+         FORCE
+     )
+ 
++    SET(PKGCONFIG_INSTALL_DIR
++        "${LIB_INSTALL_DIR}/pkgconfig"
++        CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is prefix/lib)"
++        FORCE
++    )
++
+     SET(LIBEXEC_INSTALL_DIR
+         "${EXEC_INSTALL_PREFIX}/libexec"
+         CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is prefix/libexec)"
diff --git a/debian/patches/series b/debian/patches/series
index caf8962..044d969 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 Portable-handling-for-va_list.patch
+cmake-Configurable-pkgconfig-install-destination.patch
 Link-against-libm.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libfann.git