From 6593c433f33d9767f76ed78720e8600c6cb8ab55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Charybdis=29?=
<stephane.adjemian@univ-lemans.fr>
Date: Tue, 3 May 2016 22:20:10 +0200
Subject: [PATCH] Revert "Account for Matlab 2016a in installer and mex-folder"
This reverts commit 6072aa0b462484da990ffa00ee39fb141fa9513f.
---
m4/ax_matlab_version.m4 | 3 ---
matlab/add_path_to_mex_files.m | 2 +-
windows/dynare.nsi | 6 +++---
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/m4/ax_matlab_version.m4 b/m4/ax_matlab_version.m4
index 2fae21f2c5..b3047770e5 100644
--- a/m4/ax_matlab_version.m4
+++ b/m4/ax_matlab_version.m4
@@ -22,9 +22,6 @@ AC_REQUIRE([AX_MATLAB])
AC_MSG_CHECKING([for MATLAB version])
if test "x$MATLAB_VERSION" != "x"; then
case $MATLAB_VERSION in
- *2016a | *2016A)
- MATLAB_VERSION="9.0"
- ;;
*2015b | *2015B)
MATLAB_VERSION="8.6"
;;
diff --git a/matlab/add_path_to_mex_files.m b/matlab/add_path_to_mex_files.m
index 7408746cfc..ff0f841149 100644
--- a/matlab/add_path_to_mex_files.m
+++ b/matlab/add_path_to_mex_files.m
@@ -48,7 +48,7 @@ else
end
end
else
- tmp = [dynareroot '../mex/matlab/win64-7.8-9.0/'];
+ tmp = [dynareroot '../mex/matlab/win64-7.8-8.6/'];
if exist(tmp, 'dir')
mexpath = tmp;
if modifypath
diff --git a/windows/dynare.nsi b/windows/dynare.nsi
index ea17caa4b3..0e1d628c60 100644
--- a/windows/dynare.nsi
+++ b/windows/dynare.nsi
@@ -98,9 +98,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 9.0 (R2009a to R2016a)"
- SetOutPath $INSTDIR\mex\matlab\win64-7.8-9.0
- File ..\mex\matlab\win64-7.8-9.0\*.mexw64
+Section "MEX files for MATLAB 64-bit, version 7.8 to 8.6 (R2009a to R2015b)"
+ SetOutPath $INSTDIR\mex\matlab\win64-7.8-8.6
+ File ..\mex\matlab\win64-7.8-8.6\*.mexw64
SectionEnd
SectionGroupEnd
--
GitLab