Provisions for MATLAB 8.5 (R2015a)

(cherry picked from commit 1a3d8d0b)

m4/ax_matlab_version.m4

-dnl Copyright (C) 2009-2014 Dynare Team
+dnl Copyright (C) 2009-2015 Dynare Team
 dnl
 dnl This file is part of Dynare.
 dnl
@@ -22,6 +22,9 @@ AC_REQUIRE([AX_MATLAB])
 AC_MSG_CHECKING([for MATLAB version])
 if test "x$MATLAB_VERSION" != "x"; then
   case $MATLAB_VERSION in
+    *2015a | *2015A)
+      MATLAB_VERSION="8.5"
+      ;;
     *2014b | *2014B)
       MATLAB_VERSION="8.4"
       ;;

matlab/dynare_config.m

@@ -120,7 +120,7 @@ else
                 addpath(mexpath)
             end
         else
-            mexpath = [dynareroot '../mex/matlab/win32-7.5-8.4'];
+            mexpath = [dynareroot '../mex/matlab/win32-7.5-8.5'];
             if exist(mexpath, 'dir')
                 addpath(mexpath)
             end
@@ -140,7 +140,7 @@ else
                 addpath(mexpath)
             end
         else
-            mexpath = [dynareroot '../mex/matlab/win64-7.8-8.4'];
+            mexpath = [dynareroot '../mex/matlab/win64-7.8-8.5'];
             if exist(mexpath, 'dir')
                 addpath(mexpath)
             end

windows/dynare.nsi

@@ -88,9 +88,9 @@ Section "MEX files for MATLAB 32-bit, version 7.3 to 7.4 (R2006b to R2007a)"
  File ..\mex\matlab\win32-7.3-7.4\*.mexw32
 SectionEnd
 
-Section "MEX files for MATLAB 32-bit, version 7.5 to 8.4 (R2007b to R2014b)"
- SetOutPath $INSTDIR\mex\matlab\win32-7.5-8.4
- File ..\mex\matlab\win32-7.5-8.4\*.mexw32
+Section "MEX files for MATLAB 32-bit, version 7.5 to 8.4 (R2007b to R2015a)"
+ SetOutPath $INSTDIR\mex\matlab\win32-7.5-8.5
+ File ..\mex\matlab\win32-7.5-8.5\*.mexw32
 SectionEnd
 
 Section "MEX files for MATLAB 64-bit, version 7.3 to 7.4 (R2006b to R2007a)"
@@ -103,9 +103,9 @@ Section "MEX files for MATLAB 64-bit, version 7.5 to 7.7 (R2007b to R2008b)"
  File ..\mex\matlab\win64-7.5-7.7\*.mexw64
 SectionEnd
 
-Section "MEX files for MATLAB 64-bit, version 7.8 to 8.4 (R2009a to R2014b)"
- SetOutPath $INSTDIR\mex\matlab\win64-7.8-8.4
- File ..\mex\matlab\win64-7.8-8.4\*.mexw64
+Section "MEX files for MATLAB 64-bit, version 7.8 to 8.5 (R2009a to R2015a)"
+ SetOutPath $INSTDIR\mex\matlab\win64-7.8-8.5
+ File ..\mex\matlab\win64-7.8-8.5\*.mexw64
 SectionEnd
 
 SectionGroupEnd