summaryrefslogtreecommitdiff
path: root/Examples/test-suite/matlab/Makefile.in
diff options
context:
space:
mode:
authorJoel Andersson <j.a.e.andersson@gmail.com>2016-07-06 10:58:06 -0500
committerJoel Andersson <j.a.e.andersson@gmail.com>2016-07-06 19:25:51 -0500
commit7e057d2b9f8c99575ed3e5a06a7c5fa34b72a173 (patch)
tree0c549d96e0ab9ca8747fe61588560fffc6be6e33 /Examples/test-suite/matlab/Makefile.in
parentc1c36cc81e27bed901b72e3c30a216c56bfa4d67 (diff)
downloadswig-7e057d2b9f8c99575ed3e5a06a7c5fa34b72a173.tar.gz
Issue #67 Made build system MATLAB/Octave bilingual
Diffstat (limited to 'Examples/test-suite/matlab/Makefile.in')
-rw-r--r--Examples/test-suite/matlab/Makefile.in15
1 files changed, 6 insertions, 9 deletions
diff --git a/Examples/test-suite/matlab/Makefile.in b/Examples/test-suite/matlab/Makefile.in
index 7e33da30a..282923765 100644
--- a/Examples/test-suite/matlab/Makefile.in
+++ b/Examples/test-suite/matlab/Makefile.in
@@ -2,10 +2,11 @@
# Makefile for matlab test-suite
#######################################################################
-LANGUAGE = matlab
-MATLAB = @MATLAB@
-MATLABOPTS = -nodisplay -nosplash -nojvm
-SCRIPTSUFFIX = _runme
+LANGUAGE = matlab
+MATLAB = @MATLAB@
+MATLAB_OPTS = @MATLAB_OPTS@
+MATLAB_EXEC = @MATLAB_EXEC@
+SCRIPTSUFFIX = _runme
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -16,10 +17,6 @@ CPP_TEST_BROKEN += \
include $(srcdir)/../common.mk
-# Overridden variables here
-#LIBS = -L.
-#CSRCS = matlab_empty.c
-
# Custom tests - tests with additional commandline options
# none!
@@ -53,7 +50,7 @@ run_testcase = \
end; \
exit(0)" ; \
env LD_LIBRARY_PATH=".:$$LD_LIBRARY_PATH" MATLABPATH="$(srcdir):$(SCRIPTDIR):$$MATLAB_PATH" \
- $(RUNTOOL) "$(MATLAB)" $(MATLABOPTS) -r "$$RUNSCRIPT" $(RUNPIPE); \
+ $(RUNTOOL) "$(MATLAB)" $(MATLAB_OPTS) $(MATLAB_EXEC) "$$RUNSCRIPT" $(RUNPIPE); \
if [ $$? -ne 0 ] ; then \
echo " $* failed" $(RUNPIPE) ; \
else \