[opencv] 05/17: Update patches/support_multiarch

[Nobuhiro Iwamatsu]

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

iwamatsu pushed a commit to branch master
in repository opencv.

commit 06f7baf5c5f6dc23383945b70d09d70a9227bd13
Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Date:   Mon Aug 28 08:48:41 2017 +0900

    Update patches/support_multiarch
    
    Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
---
 debian/patches/support_multiarch | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/support_multiarch b/debian/patches/support_multiarch
index 08af6bd..51b79e3 100644
--- a/debian/patches/support_multiarch
+++ b/debian/patches/support_multiarch
@@ -1,19 +1,19 @@
 Description: Install the libraries in the multiarch path
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cc45f6f394..9c55e09538 100644
+index af5e2c1ede..53ff88ec63 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -395,7 +395,7 @@ else()
+@@ -426,7 +426,7 @@ else()
      ocv_update(OPENCV_OTHER_INSTALL_PATH   etc)
      ocv_update(OPENCV_CONFIG_INSTALL_PATH  ".")
    else()
 -    ocv_update(OPENCV_LIB_INSTALL_PATH     lib${LIB_SUFFIX})
-+    set(OPENCV_LIB_INSTALL_PATH     ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX})
++    ocv_update(OPENCV_LIB_INSTALL_PATH     "${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}")
      ocv_update(OPENCV_3P_LIB_INSTALL_PATH  share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH})
      ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH    share/OpenCV/samples)
      ocv_update(OPENCV_JAR_INSTALL_PATH share/OpenCV/java)
-@@ -404,7 +404,7 @@ else()
+@@ -435,7 +435,7 @@ else()
      if(NOT DEFINED OPENCV_CONFIG_INSTALL_PATH)
        math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
        if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
@@ -22,10 +22,10 @@ index cc45f6f394..9c55e09538 100644
        else()
          ocv_update(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
        endif()
-@@ -515,6 +515,7 @@ if(UNIX)
-   find_package(PkgConfig QUIET)
+@@ -552,6 +552,7 @@ if(UNIX)
    include(CheckFunctionExists)
    include(CheckIncludeFile)
+   include(CheckSymbolExists)
 +  include(GNUInstallDirs)
  
    if(NOT APPLE)

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