fsh.patch

From 2bb4ca7cc656969a9e2c655e594428b465edbfed Mon Sep 17 00:00:00 2001
From: Valentin Churavy <v.churavy@gmail.com>
Date: Sat, 28 Mar 2015 01:30:01 +0900
Subject: [PATCH] fsh.patch

---
 CMakeLists.txt                                  | 14 +++++++-------
 cmake/templates/opencv_run_all_tests_unix.sh.in |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 11a6408..22878f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -317,7 +317,7 @@ endif()
 if(ANDROID OR WIN32)
   ocv_update(OPENCV_DOC_INSTALL_PATH doc)
 else()
-  ocv_update(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc)
+  ocv_update(OPENCV_DOC_INSTALL_PATH share/opencv/doc)
 endif()

 if(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
@@ -359,7 +359,7 @@ if(OPENCV_TEST_DATA_PATH AND NOT OPENCV_TEST_DATA_INSTALL_PATH)
   elseif(WIN32)
     ocv_update(OPENCV_TEST_DATA_INSTALL_PATH "testdata")
   else()
-    ocv_update(OPENCV_TEST_DATA_INSTALL_PATH "share/OpenCV/testdata")
+    ocv_update(OPENCV_TEST_DATA_INSTALL_PATH "share/opencv/testdata")
   endif()
 endif()

@@ -389,17 +389,17 @@ else()
     ocv_update(OPENCV_CONFIG_INSTALL_PATH  "")
   else()
     ocv_update(OPENCV_LIB_INSTALL_PATH     lib${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)
-    ocv_update(OPENCV_OTHER_INSTALL_PATH   share/OpenCV)
+    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)
+    ocv_update(OPENCV_OTHER_INSTALL_PATH   share/opencv)

     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)
         ocv_update(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/cmake/opencv)
       else()
-        ocv_update(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
+        ocv_update(OPENCV_CONFIG_INSTALL_PATH share/opencv)
       endif()
     endif()
   endif()


diff --git a/cmake/templates/opencv_run_all_tests_unix.sh.in b/cmake/templates/opencv_run_all_tests_unix.sh.in
index 7b946af..82370dc 100644
--- a/cmake/templates/opencv_run_all_tests_unix.sh.in
+++ b/cmake/templates/opencv_run_all_tests_unix.sh.in
@@ -53,7 +53,7 @@ fi

 OPENCV_TEST_PATH=@CMAKE_INSTALL_PREFIX@/@OPENCV_TEST_INSTALL_PATH@
 OPENCV_PYTHON_TESTS=@OPENCV_PYTHON_TESTS_LIST@
-export OPENCV_TEST_DATA_PATH=@CMAKE_INSTALL_PREFIX@/share/OpenCV/testdata
+export OPENCV_TEST_DATA_PATH=@CMAKE_INSTALL_PREFIX@/share/opencv/testdata

 # Run tests

--
2.4.2