More CPPFLAGS_MATIO fun

(cherry picked from commit 6cfec3f6)

mex/build/ms_sbvar.am

@@ -6,7 +6,7 @@ DWUTILITIESDIR = $(top_srcdir)/../../../contrib/ms-sbvar/utilities_dw
 DYNMEXSRCDIR = $(top_srcdir)/../../sources
 MSMEXSRCDIR = $(DYNMEXSRCDIR)/ms-sbvar
 
-CPPFLAGS += $(GSL_CPPFLAGS) $(CPPFLAGS_MATIO) -DSTRUCTURED_COLUMN_MAJOR -I$(DYNMEXSRCDIR) -I$(MSMEXSRCDIR) -I$(DWUTILITIESDIR)/include -I$(DWSWITCHDIR)/switching -I$(DWSWITCHDIR)/state_space -I$(DWSWITCHDIR)/state_space/sbvar
+CPPFLAGS += $(GSL_CPPFLAGS) -DSTRUCTURED_COLUMN_MAJOR -I$(DYNMEXSRCDIR) -I$(MSMEXSRCDIR) -I$(DWUTILITIESDIR)/include -I$(DWSWITCHDIR)/switching -I$(DWSWITCHDIR)/state_space -I$(DWSWITCHDIR)/state_space/sbvar
 
 LIBS += $(GSL_LIBS)
 LDFLAGS += $(GSL_LDFLAGS)

mex/build/octave/ms_sbvar/Makefile.am

@@ -2,8 +2,8 @@ EXEEXT = .mex
 include ../mex.am
 include ../../ms_sbvar.am
 
-ms_sbvar_command_line_CPPLAGS = $(MATIO_CPPFLAGS)
-ms_sbvar_create_init_file_CPPLAGS = $(MATIO_CPPFLAGS)
+ms_sbvar_command_line_CPPLAGS = $(CPPFLAGS_MATIO)
+ms_sbvar_create_init_file_CPPLAGS = $(CPPFLAGS_MATIO)
 
 ms_sbvar_command_line_LDFLAGS = $(LDFLAGS_MATIO)
 ms_sbvar_create_init_file_LDFLAGS = $(LDFLAGS_MATIO)