--- shogun-3.2.0_orig/cmake/FindOctave.cmake	2014-02-17 19:46:27.000000000 +0100
+++ shogun-3.2.0/cmake/FindOctave.cmake	2014-07-22 16:35:52.000000000 +0200
@@ -131,5 +131,5 @@
 endif ()
 
-find_path ( OCTAVE_INCLUDE_DIR
+find_path ( OCTAVE_INCLUDE_DIR1
             NAMES mex.h
             HINTS ${OCTAVE_INCLUDE_PATHS}
@@ -137,6 +137,11 @@
           )
 
-STRING(REGEX REPLACE "(.*)/octave$" "\\1" OCTAVE_INCLUDE_DIR ${OCTAVE_INCLUDE_DIR})
-set ( OCTAVE_INCLUDE_DIRS ${OCTAVE_INCLUDE_DIR} )
+message(STATUS "FindOctave.cmake(1) OCTAVE_INCLUDE_DIR1=${OCTAVE_INCLUDE_DIR1}")
+
+STRING(REGEX REPLACE "(.*)/octave$" "\\1" OCTAVE_INCLUDE_DIR2 ${OCTAVE_INCLUDE_DIR1})
+message(STATUS "FindOctave.cmake(2) OCTAVE_INCLUDE_DIR2=${OCTAVE_INCLUDE_DIR2}")
+
+set ( OCTAVE_INCLUDE_DIRS ${OCTAVE_INCLUDE_DIR1};${OCTAVE_INCLUDE_DIR2} )
+message(STATUS "FindOctave.cmake(3) OCTAVE_INCLUDE_DIRS=${OCTAVE_INCLUDE_DIRS}")
 
 macro ( octave_add_oct FUNCTIONNAME )