Update of the makefile due to the few changes in the configure and the compilation...
Sylvestre Ledru [Thu, 15 Nov 2007 12:40:48 +0000 (12:40 +0000)]
66 files changed:
scilab/Makefile.in
scilab/libs/MALLOC/Makefile.in
scilab/libs/blas/Makefile.in
scilab/libs/doublylinkedlist/Makefile.in
scilab/libs/dynamiclibrary/Makefile.in
scilab/libs/hashtable/Makefile.in
scilab/libs/lapack/Makefile.in
scilab/libs/libst/Makefile.in
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.in
scilab/modules/arnoldi/Makefile.in
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.in
scilab/modules/compatibility_functions/Makefile.in
scilab/modules/completion/Makefile.in
scilab/modules/console/Makefile.in
scilab/modules/core/Makefile.in
scilab/modules/data_structures/Makefile.in
scilab/modules/development_tools/Makefile.in
scilab/modules/differential_equations/Makefile.in
scilab/modules/double/Makefile.in
scilab/modules/elementary_functions/Makefile.in
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.in
scilab/modules/functions/Makefile.in
scilab/modules/graphics/Makefile.in
scilab/modules/gui/Makefile.in
scilab/modules/helptools/Makefile.in
scilab/modules/history_manager/Makefile.in
scilab/modules/incremental_link/Makefile.in
scilab/modules/integer/Makefile.in
scilab/modules/interpolation/Makefile.in
scilab/modules/intersci/Makefile.in
scilab/modules/io/Makefile.in
scilab/modules/javasci/Makefile.in
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.in
scilab/modules/m2sci/Makefile.in
scilab/modules/maple2scilab/Makefile.in
scilab/modules/metanet/Makefile.in
scilab/modules/mexlib/Makefile.in
scilab/modules/optimization/Makefile.in
scilab/modules/others/Makefile.in
scilab/modules/output_stream/Makefile.in
scilab/modules/overloading/Makefile.in
scilab/modules/polynomials/Makefile.in
scilab/modules/pvm/Makefile.in
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.in
scilab/modules/scicos/Makefile.in
scilab/modules/scilab2fortran/Makefile.in
scilab/modules/scipad/Makefile.in
scilab/modules/shell/Makefile.in
scilab/modules/signal_processing/Makefile.in
scilab/modules/sound/Makefile.in
scilab/modules/sparse/Makefile.in
scilab/modules/special_functions/Makefile.in
scilab/modules/spreadsheet/Makefile.in
scilab/modules/statistics/Makefile.in
scilab/modules/string/Makefile.in
scilab/modules/symbolic/Makefile.in
scilab/modules/tclsci/Makefile.in
scilab/modules/texmacs/Makefile.in
scilab/modules/time/Makefile.in
scilab/modules/windows_tools/Makefile.in

index 9ea8414..3cd9c62 100644 (file)
@@ -49,10 +49,10 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
        $(top_srcdir)/etc/modules.xml.in \
        $(top_srcdir)/modules/core/includes/machine.h.in \
        $(top_srcdir)/modules/helptools/macros/xmlfiletohtml.sci.in \
-       $(top_srcdir)/modules/scicos/src/ocaml/Makefile.in \
-       config/compile config/config.guess config/config.sub \
-       config/depcomp config/install-sh config/ltmain.sh \
-       config/missing
+       $(top_srcdir)/modules/scicos/src/ocaml/Makefile.in ABOUT-NLS \
+       config/compile config/config.guess config/config.rpath \
+       config/config.sub config/depcomp config/install-sh \
+       config/ltmain.sh config/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
        $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
@@ -948,6 +948,7 @@ build-localization:
        MASK="modules/*/locales/"; \
        LC=LC_MESSAGES; \
        FILENAME="messages.po*"; \
+       rm modules/*/locales/*/*~; \
        for LOCALE in $(ALL_LINGUAS); do \
                FILES=`ls $$MASK/$$LOCALE/$$FILENAME`; \
                PATHTO=$(top_srcdir)/locale/$$LOCALE/$$LC/; \
index a179a36..594a35d 100644 (file)
@@ -721,17 +721,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index bad946f..67f209f 100644 (file)
@@ -732,17 +732,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index dca5c9c..5ddac95 100644 (file)
@@ -712,17 +712,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 968a31f..e7608a7 100644 (file)
@@ -713,17 +713,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 83dccd5..502ce0f 100644 (file)
@@ -708,17 +708,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index f547451..218923b 100644 (file)
@@ -1021,17 +1021,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 9d5f88f..2b39d47 100644 (file)
@@ -671,17 +671,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index cde31fd..52598a9 100644 (file)
@@ -892,17 +892,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 66c04df..09359ff 100644 (file)
@@ -865,17 +865,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 28a0615..6189550 100644 (file)
@@ -1111,17 +1111,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 4332a42..83650a1 100644 (file)
@@ -908,17 +908,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index a56c796..959331e 100644 (file)
@@ -1868,17 +1868,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index af7a28f..778a1a2 100644 (file)
@@ -593,17 +593,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index aa8cdc4..9e9c681 100644 (file)
@@ -941,17 +941,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index b342bc2..407beb6 100644 (file)
@@ -1009,17 +1009,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 2b2174d..e411478 100644 (file)
@@ -2959,17 +2959,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 76d2ada..a87fe76 100644 (file)
@@ -1052,17 +1052,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 728005d..5097909 100644 (file)
@@ -591,17 +591,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 82d4035..083fb9f 100644 (file)
@@ -1435,17 +1435,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 1b06965..6cdfeb4 100644 (file)
@@ -841,17 +841,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 72e3823..cd79082 100644 (file)
@@ -2996,17 +2996,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 0052ca3..ce4c440 100644 (file)
@@ -961,17 +961,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index f954091..8dc9c1b 100644 (file)
@@ -1422,17 +1422,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index b73880e..b98951e 100644 (file)
@@ -589,17 +589,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index c4d15a9..7b8050e 100644 (file)
@@ -5245,17 +5245,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 1f9cd8d..96020c6 100644 (file)
@@ -1190,17 +1190,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index ea9b702..6c957d0 100644 (file)
@@ -589,17 +589,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 0aa59a7..cc85c1c 100644 (file)
@@ -1077,17 +1077,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 7d6984c..972c39e 100644 (file)
@@ -662,17 +662,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 6e90d02..9a2fd4b 100644 (file)
@@ -1516,17 +1516,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index ae3a800..29c54a3 100644 (file)
@@ -1012,17 +1012,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 3ed6982..9bd1cdd 100644 (file)
@@ -978,17 +978,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 045ecaa..9b174c0 100644 (file)
@@ -1298,17 +1298,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 9077774..ec4f637 100644 (file)
@@ -885,17 +885,17 @@ uninstall-am: uninstall-libjavasci_la_etcDATA \
 @JAVASCI_TRUE@ fi )
 
 @JAVASCI_TRUE@macrossly:
-@JAVASCI_TRUE@ @( if test ! -x $(top_builddir)/scilab-bin; then \
+@JAVASCI_TRUE@ @( if test ! -x $(top_builddir)/bin/scilab; then \
 @JAVASCI_TRUE@ echo "Error : Cannot build $< : Scilab has not been build"; \
 @JAVASCI_TRUE@ else \
 @JAVASCI_TRUE@ LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
 @JAVASCI_TRUE@ SCI=`cd $(top_builddir); pwd;`; export SCI; \
 @JAVASCI_TRUE@ echo $$SCI/modules/functions/macros/genlib.bin; \
 @JAVASCI_TRUE@ if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-@JAVASCI_TRUE@ (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+@JAVASCI_TRUE@ (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
 @JAVASCI_TRUE@ fi; \
-@JAVASCI_TRUE@ echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-@JAVASCI_TRUE@ $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+@JAVASCI_TRUE@ echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+@JAVASCI_TRUE@ $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
 @JAVASCI_TRUE@ fi )
 @JAVASCI_TRUE@install-html-local:
 @JAVASCI_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index e250ec4..0f3f492 100644 (file)
@@ -1032,17 +1032,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 947f903..fff6675 100644 (file)
@@ -1269,17 +1269,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index b254a14..c65652e 100644 (file)
@@ -881,17 +881,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 0e8c323..91c5fc6 100644 (file)
@@ -594,17 +594,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 2a8e76f..48edcd2 100644 (file)
@@ -589,17 +589,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 12fcf1e..572e7bf 100644 (file)
@@ -1373,17 +1373,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 38592f2..758d2ee 100644 (file)
@@ -809,17 +809,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 1fa6ee7..e7976b8 100644 (file)
@@ -1499,17 +1499,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 446d43d..99c016b 100644 (file)
@@ -812,17 +812,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 9b325ef..a4d1937 100644 (file)
@@ -955,17 +955,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 1fcb6e3..129579d 100644 (file)
@@ -591,17 +591,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 54d5838..315ebf6 100644 (file)
@@ -1327,17 +1327,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 89fa0f3..95d72dc 100644 (file)
@@ -1360,17 +1360,17 @@ uninstall-am: uninstall-libscipvm_la_demosDATA \
 @PVM_TRUE@     fi )
 
 @PVM_TRUE@macrossly:
-@PVM_TRUE@     @( if test ! -x $(top_builddir)/scilab-bin; then \
+@PVM_TRUE@     @( if test ! -x $(top_builddir)/bin/scilab; then \
 @PVM_TRUE@     echo "Error : Cannot build $< : Scilab has not been build"; \
 @PVM_TRUE@     else \
 @PVM_TRUE@     LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
 @PVM_TRUE@     SCI=`cd $(top_builddir); pwd;`; export SCI; \
 @PVM_TRUE@     echo $$SCI/modules/functions/macros/genlib.bin; \
 @PVM_TRUE@     if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-@PVM_TRUE@     (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+@PVM_TRUE@     (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
 @PVM_TRUE@     fi; \
-@PVM_TRUE@     echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-@PVM_TRUE@     $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+@PVM_TRUE@     echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+@PVM_TRUE@     $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
 @PVM_TRUE@     fi )
 @PVM_TRUE@install-html-local:
 @PVM_TRUE@     $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
@@ -1526,17 +1526,17 @@ uninstall-am: uninstall-libscipvm_la_demosDATA \
 @PVM_FALSE@    fi )
 
 @PVM_FALSE@macrossly:
-@PVM_FALSE@    @( if test ! -x $(top_builddir)/scilab-bin; then \
+@PVM_FALSE@    @( if test ! -x $(top_builddir)/bin/scilab; then \
 @PVM_FALSE@    echo "Error : Cannot build $< : Scilab has not been build"; \
 @PVM_FALSE@    else \
 @PVM_FALSE@    LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
 @PVM_FALSE@    SCI=`cd $(top_builddir); pwd;`; export SCI; \
 @PVM_FALSE@    echo $$SCI/modules/functions/macros/genlib.bin; \
 @PVM_FALSE@    if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-@PVM_FALSE@    (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+@PVM_FALSE@    (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
 @PVM_FALSE@    fi; \
-@PVM_FALSE@    echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-@PVM_FALSE@    $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+@PVM_FALSE@    echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+@PVM_FALSE@    $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
 @PVM_FALSE@    fi )
 @PVM_FALSE@install-html-local:
 @PVM_FALSE@    $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 49ea091..c0d9426 100644 (file)
@@ -1032,17 +1032,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 7c6425c..8479d2d 100644 (file)
@@ -2362,17 +2362,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index efef18a..7c96f4d 100644 (file)
@@ -2348,17 +2348,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index aaa4657..fcac0b4 100644 (file)
@@ -627,17 +627,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index bc1c6b0..b68ff0c 100644 (file)
@@ -590,17 +590,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 09fead4..08ea3d1 100644 (file)
@@ -976,17 +976,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 229f1cf..2ca9578 100644 (file)
@@ -1271,17 +1271,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index cd09a74..718c8f6 100644 (file)
@@ -909,17 +909,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index b562a3a..2ac9ef1 100644 (file)
@@ -1654,17 +1654,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 0a9febb..e023369 100644 (file)
@@ -1020,17 +1020,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 97ecd51..c732dc1 100644 (file)
@@ -942,17 +942,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index dc1c815..d5fea85 100644 (file)
@@ -1246,17 +1246,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 12024b1..90ac3e3 100644 (file)
@@ -1081,17 +1081,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index beecaab..6d7564b 100644 (file)
@@ -871,17 +871,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index f310fcb..854bb60 100644 (file)
@@ -1597,17 +1597,17 @@ uninstall-am: uninstall-libscitclsci_la_demossciGUIDATA \
 @TCLTK_TRUE@   fi )
 
 @TCLTK_TRUE@macrossly:
-@TCLTK_TRUE@   @( if test ! -x $(top_builddir)/scilab-bin; then \
+@TCLTK_TRUE@   @( if test ! -x $(top_builddir)/bin/scilab; then \
 @TCLTK_TRUE@   echo "Error : Cannot build $< : Scilab has not been build"; \
 @TCLTK_TRUE@   else \
 @TCLTK_TRUE@   LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
 @TCLTK_TRUE@   SCI=`cd $(top_builddir); pwd;`; export SCI; \
 @TCLTK_TRUE@   echo $$SCI/modules/functions/macros/genlib.bin; \
 @TCLTK_TRUE@   if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-@TCLTK_TRUE@   (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+@TCLTK_TRUE@   (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
 @TCLTK_TRUE@   fi; \
-@TCLTK_TRUE@   echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-@TCLTK_TRUE@   $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+@TCLTK_TRUE@   echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+@TCLTK_TRUE@   $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
 @TCLTK_TRUE@   fi )
 @TCLTK_TRUE@install-html-local:
 @TCLTK_TRUE@   $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
@@ -1763,17 +1763,17 @@ uninstall-am: uninstall-libscitclsci_la_demossciGUIDATA \
 @TCLTK_FALSE@  fi )
 
 @TCLTK_FALSE@macrossly:
-@TCLTK_FALSE@  @( if test ! -x $(top_builddir)/scilab-bin; then \
+@TCLTK_FALSE@  @( if test ! -x $(top_builddir)/bin/scilab; then \
 @TCLTK_FALSE@  echo "Error : Cannot build $< : Scilab has not been build"; \
 @TCLTK_FALSE@  else \
 @TCLTK_FALSE@  LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
 @TCLTK_FALSE@  SCI=`cd $(top_builddir); pwd;`; export SCI; \
 @TCLTK_FALSE@  echo $$SCI/modules/functions/macros/genlib.bin; \
 @TCLTK_FALSE@  if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-@TCLTK_FALSE@  (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+@TCLTK_FALSE@  (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
 @TCLTK_FALSE@  fi; \
-@TCLTK_FALSE@  echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-@TCLTK_FALSE@  $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+@TCLTK_FALSE@  echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+@TCLTK_FALSE@  $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
 @TCLTK_FALSE@  fi )
 @TCLTK_FALSE@install-html-local:
 @TCLTK_FALSE@  $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index dfd6a0c..2830074 100644 (file)
@@ -589,17 +589,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index 4c73cdc..39ed638 100644 (file)
@@ -910,17 +910,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
index b09ba46..3a9aafd 100644 (file)
@@ -815,17 +815,17 @@ build-giws: $(GIWS_WRAPPERS)
        fi )
 
 macrossly:
-       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       @( if test ! -x $(top_builddir)/bin/scilab; then \
        echo "Error : Cannot build $< : Scilab has not been build"; \
        else \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        SCI=`cd $(top_builddir); pwd;`; export SCI; \
        echo $$SCI/modules/functions/macros/genlib.bin; \
        if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
-       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       (cd $$SCI; $$SCI/bin/scilab -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
        fi; \
-       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
-       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       echo $(top_builddir)/bin/scilab -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/bin/scilab -nwni -f macros/buildmacros.sce; \
        fi )
 install-html-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)