1 diff -up pfstools-2.0.4/CMakeLists.txt.octinstall pfstools-2.0.4/CMakeLists.txt
2 --- pfstools-2.0.4/CMakeLists.txt.octinstall 2015-07-20 13:06:32.533996797 +0200
3 +++ pfstools-2.0.4/CMakeLists.txt 2015-07-20 13:11:35.728808062 +0200
4 @@ -277,8 +277,6 @@ OPTION(WITH_HDRVC "Compile HDRVC (intern
5 # ======== MKOCTFILE/OCTAVE ===========
7 OPTION(WITH_Octave "Compile Octave files" ON)
8 -SET (OCTAVE_DEST_DIR "${CMAKE_INSTALL_PREFIX}/share/pfstools/octave"
9 -CACHE PATH "Copy octave functions to this directory")
13 @@ -289,7 +287,8 @@ if( WITH_Octave )
15 message(STATUS "mkoctfile found.")
18 + execute_process(COMMAND octave-config --oct-site-dir OUTPUT_VARIABLE OCTAVE_OCT_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
19 + execute_process(COMMAND octave-config --m-site-dir OUTPUT_VARIABLE OCTAVE_M_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
22 # ======== OpenCV ===========
23 diff -up pfstools-2.0.4/src/octave/CMakeLists.txt.octinstall pfstools-2.0.4/src/octave/CMakeLists.txt
24 --- pfstools-2.0.4/src/octave/CMakeLists.txt.octinstall 2015-07-20 13:03:30.448679088 +0200
25 +++ pfstools-2.0.4/src/octave/CMakeLists.txt 2015-07-20 13:12:42.873544809 +0200
26 @@ -40,11 +40,11 @@ endforeach(SRC)
27 foreach(SRC ${SRC_OCT})
28 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${SRC}.oct
29 PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE OWNER_WRITE WORLD_READ GROUP_READ OWNER_READ
30 - DESTINATION ${OCTAVE_DEST_DIR})
31 + DESTINATION "${OCTAVE_OCT_DIR}/pfstools")
35 - install (FILES ${SRC} DESTINATION ${OCTAVE_DEST_DIR})
36 + install (FILES ${SRC} DESTINATION "${OCTAVE_M_DIR}/pfstools")
39 install (FILES ${OCT_SCRIPTS}