[flann] 49/54: Make lib multiarch

[Leopold Palomo-Avellaneda]

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

lepalom-guest pushed a commit to branch master
in repository flann.

commit d8f9ea581ee326a1d88afa7f96d4729c1445e93d
Author: Mathieu Malaterre <malat at debian.org>
Date:   Thu Jan 3 12:52:46 2013 +0000

    Make lib multiarch
---
 debian/changelog                            |  3 ++-
 debian/patches/fixmultiarchlibinstall.patch | 16 ++++++++++++++++
 debian/patches/series                       |  1 +
 debian/rules                                |  3 +++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3b9284e..df5304f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ flann (1.8.3-1) experimental; urgency=low
   * remove patch not needed anymore:
     - debian/patches/remove_lib64.patch
   * Remove obsolete DMUA flag
+  * Use multiarch lib path
 
- -- Mathieu Malaterre <malat at debian.org>  Thu, 03 Jan 2013 13:11:26 +0100
+ -- Mathieu Malaterre <malat at debian.org>  Thu, 03 Jan 2013 13:51:42 +0100
 
 flann (1.7.1-4) unstable; urgency=low
 
diff --git a/debian/patches/fixmultiarchlibinstall.patch b/debian/patches/fixmultiarchlibinstall.patch
new file mode 100644
index 0000000..e18c729
--- /dev/null
+++ b/debian/patches/fixmultiarchlibinstall.patch
@@ -0,0 +1,16 @@
+Description: Allow multi-arch lib installation
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: no
+
+--- flann-1.8.3.orig/cmake/flann_utils.cmake
++++ flann-1.8.3/cmake/flann_utils.cmake
+@@ -1,6 +1,8 @@
+ macro(GET_OS_INFO)
+     string(REGEX MATCH "Linux" OS_IS_LINUX ${CMAKE_SYSTEM_NAME})
+-    set(FLANN_LIB_INSTALL_DIR "lib")
++    if(NOT DEFINED FLANN_LIB_INSTALL_DIR)
++      set(FLANN_LIB_INSTALL_DIR "lib")
++    endif()
+     set(FLANN_INCLUDE_INSTALL_DIR
+         "include/${PROJECT_NAME_LOWER}-${FLANN_MAJOR_VERSION}.${FLANN_MINOR_VERSION}")
+ endmacro(GET_OS_INFO)
diff --git a/debian/patches/series b/debian/patches/series
index f2850ba..903f210 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 remove_tests.patch
+fixmultiarchlibinstall.patch
diff --git a/debian/rules b/debian/rules
index 9201fd2..43b2b28 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,12 +3,15 @@
 
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 CMAKE_FLAGS = \
 	-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
 	-DBUILD_MATLAB_BINDINGS:BOOL=OFF \
 	-DBUILD_PYTHON_BINDINGS:BOOL=OFF \
 	-DUSE_MPI:BOOL=ON \
 	-DUSE_OPENMP:BOOL=ON \
+	-DFLANN_LIB_INSTALL_DIR:STRING="lib/$(DEB_HOST_MULTIARCH)" \
 	-DBUILD_CUDA_LIB:BOOL=OFF
 
 %:

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