diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 53c9fff24..aa3b85bd0 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1554,12 +1554,11 @@ r_clean: # Make sure these locate your Scilab installation SCILAB_LIB = @SCILABLIB@ SCILAB = @SCILAB@ -SCILABOPT = -SCILAB_STARTOPT = @SCILABSTARTOPT@ +SCILAB_OPT = @SCILABOPT@ # Returns the Swig Scilab command line args define get_swig_scilab_args - SWIG_SCILAB_ARGS := -scilab $(SCILABOPT) + SWIG_SCILAB_ARGS := -scilab ifdef SRCS SWIG_SCILAB_ARGS += -addsrc "$(SRCS)" endif @@ -1576,7 +1575,7 @@ scilab: $(SRCS) $(eval $(call get_swig_scilab_args)) $(SWIG) $(SWIGOPT) $(SWIG_SCILAB_ARGS) $(INTERFACEPATH) if [ -f builder.sce ]; then \ - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_STARTOPT) -e "exit(exec('builder.sce', 'errcatch', -1))"; \ + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -e "exit(exec('builder.sce', 'errcatch', -1))"; \ fi # ---------------------------------------------------------------- @@ -1587,7 +1586,7 @@ scilab_cpp: $(SRCS) $(eval $(call get_swig_scilab_args)) $(SWIG) $(SWIGOPT) -c++ $(SWIG_SCILAB_ARGS) $(INTERFACEPATH) if [ -f builder.sce ]; then \ - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_STARTOPT) -e "exit(exec('builder.sce', 'errcatch', -1))"; \ + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -e "exit(exec('builder.sce', 'errcatch', -1))"; \ fi # ----------------------------------------------------------------- @@ -1596,7 +1595,7 @@ scilab_cpp: $(SRCS) scilab_run: if [ -f $(RUNME) ]; then \ - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(SCILAB) $( SCILAB_STARTOPT) -f $(RUNME).sci $(RUNPIPE); \ + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -f $(RUNME).sci $(RUNPIPE); \ fi # ----------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 6240987a8..42806c2bb 100644 --- a/configure.ac +++ b/configure.ac @@ -964,11 +964,11 @@ else # Set Scilab startup options depending on version AC_MSG_CHECKING(for Scilab startup options) - SCILABSTARTOPT="-nwni -nb" + SCILABOPT="-nwni -nb" if test $SCILAB_VERSION -ge 54; then - SCILABSTARTOPT+=" -noatomsautoload" + SCILABOPT+=" -noatomsautoload" fi - AC_MSG_RESULT($SCILABSTARTOPT) + AC_MSG_RESULT($SCILABOPT) fi # Check for Scilab header files @@ -996,7 +996,7 @@ else fi AC_SUBST(SCILAB) -AC_SUBST(SCILABSTARTOPT) +AC_SUBST(SCILABOPT) #----------------------------------------------------------------