summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scilab/CHANGES_5.2.X12
-rw-r--r--scilab/Makefile.incl.am1
-rw-r--r--scilab/libs/MALLOC/Makefile.in1
-rw-r--r--scilab/libs/doublylinkedlist/Makefile.in1
-rw-r--r--scilab/libs/dynamiclibrary/Makefile.in1
-rw-r--r--scilab/libs/hashtable/Makefile.in1
-rw-r--r--scilab/libs/libst/Makefile.in1
-rw-r--r--scilab/modules/action_binding/Makefile.in1
-rw-r--r--scilab/modules/api_scilab/Makefile.in1
-rw-r--r--scilab/modules/arnoldi/Makefile.in1
-rw-r--r--scilab/modules/atoms/Makefile.in1
-rw-r--r--scilab/modules/boolean/Makefile.in1
-rw-r--r--scilab/modules/cacsd/Makefile.in1
-rw-r--r--scilab/modules/call_scilab/Makefile.in1
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in1
-rw-r--r--scilab/modules/completion/Makefile.in1
-rw-r--r--scilab/modules/console/Makefile.in1
-rw-r--r--scilab/modules/core/Makefile.in1
-rw-r--r--scilab/modules/data_structures/Makefile.in1
-rw-r--r--scilab/modules/demo_tools/Makefile.in1
-rw-r--r--scilab/modules/development_tools/Makefile.in1
-rw-r--r--scilab/modules/differential_equations/Makefile.in1
-rw-r--r--scilab/modules/double/Makefile.in1
-rw-r--r--scilab/modules/dynamic_link/Makefile.in1
-rw-r--r--scilab/modules/elementary_functions/Makefile.in1
-rw-r--r--scilab/modules/fftw/Makefile.in1
-rw-r--r--scilab/modules/fileio/Makefile.in1
-rw-r--r--scilab/modules/functions/Makefile.in1
-rw-r--r--scilab/modules/genetic_algorithms/Makefile.in1
-rw-r--r--scilab/modules/graphic_export/Makefile.in1
-rw-r--r--scilab/modules/graphics/Makefile.in1
-rw-r--r--scilab/modules/graphics/src/c/sciCall.c1
-rw-r--r--scilab/modules/gui/Makefile.in1
-rw-r--r--scilab/modules/hdf5/Makefile.in1
-rw-r--r--scilab/modules/helptools/Makefile.in1
-rw-r--r--scilab/modules/history_manager/Makefile.in1
-rw-r--r--scilab/modules/integer/Makefile.in1
-rw-r--r--scilab/modules/interpolation/Makefile.in1
-rw-r--r--scilab/modules/intersci/Makefile.in1
-rw-r--r--scilab/modules/io/Makefile.in1
-rw-r--r--scilab/modules/javasci/Makefile.in1
-rw-r--r--scilab/modules/jvm/Makefile.in1
-rw-r--r--scilab/modules/linear_algebra/Makefile.in1
-rw-r--r--scilab/modules/localization/Makefile.in1
-rw-r--r--scilab/modules/m2sci/Makefile.in1
-rw-r--r--scilab/modules/maple2scilab/Makefile.in1
-rw-r--r--scilab/modules/matio/Makefile.in1
-rw-r--r--scilab/modules/mexlib/Makefile.in1
-rw-r--r--scilab/modules/optimization/Makefile.in1
-rw-r--r--scilab/modules/output_stream/Makefile.in1
-rw-r--r--scilab/modules/overloading/Makefile.in1
-rw-r--r--scilab/modules/parameters/Makefile.in1
-rw-r--r--scilab/modules/polynomials/Makefile.in1
-rw-r--r--scilab/modules/pvm/Makefile.in2
-rw-r--r--scilab/modules/randlib/Makefile.in1
-rw-r--r--scilab/modules/renderer/Makefile.in1
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/textDrawing/SpecialTextObjectGL.java39
-rw-r--r--scilab/modules/scicos/Makefile.in1
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in1
-rw-r--r--scilab/modules/shell/Makefile.in1
-rw-r--r--scilab/modules/signal_processing/Makefile.in1
-rw-r--r--scilab/modules/simulated_annealing/Makefile.in1
-rw-r--r--scilab/modules/sound/Makefile.in1
-rw-r--r--scilab/modules/sparse/Makefile.in1
-rw-r--r--scilab/modules/special_functions/Makefile.in1
-rw-r--r--scilab/modules/spreadsheet/Makefile.in1
-rw-r--r--scilab/modules/statistics/Makefile.in1
-rw-r--r--scilab/modules/string/Makefile.in1
-rw-r--r--scilab/modules/symbolic/Makefile.in1
-rw-r--r--scilab/modules/tclsci/Makefile.in1
-rw-r--r--scilab/modules/texmacs/Makefile.in1
-rw-r--r--scilab/modules/time/Makefile.in1
-rw-r--r--scilab/modules/umfpack/Makefile.in1
-rw-r--r--scilab/modules/windows_tools/Makefile.in1
-rw-r--r--scilab/modules/xcos/Makefile.in1
-rw-r--r--scilab/modules/xpad/Makefile.in1
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/XpadGUI.java2
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/LoadIntoScilabAction.java81
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/utils/XpadMessages.java6
-rw-r--r--scilab/modules/xpad/tests/nonreg_tests/bug_5140.tst12
80 files changed, 185 insertions, 42 deletions
diff --git a/scilab/CHANGES_5.2.X b/scilab/CHANGES_5.2.X
index 7178ce2..9a4caac 100644
--- a/scilab/CHANGES_5.2.X
+++ b/scilab/CHANGES_5.2.X
@@ -9,7 +9,7 @@ Performance:
9 improve performances to 50 %). 9 improve performances to 50 %).
10 Note that many performance improvements will be also available in Scilab 5.3.0. 10 Note that many performance improvements will be also available in Scilab 5.3.0.
11 11
12Help brower: 12Help browser:
13============ 13============
14 14
15* Increase of the default size of the help browser window. 15* Increase of the default size of the help browser window.
@@ -123,6 +123,8 @@ Compilation:
123 Java 1.6 (64 bits only). 123 Java 1.6 (64 bits only).
124 This option will set the LDFLAGS & source the fink init script. 124 This option will set the LDFLAGS & source the fink init script.
125 125
126* Some macros were duplicated during the installation process.
127
126* CFLAGS -msse2 added under Mac OS X for Scilab module shell. See bug 128* CFLAGS -msse2 added under Mac OS X for Scilab module shell. See bug
127 #6839 129 #6839
128 130
@@ -198,6 +200,10 @@ Bug Fixes:
198 200
199* bug 4599 fixed - It was possible create many different variables with the 201* bug 4599 fixed - It was possible create many different variables with the
200 same name in the same scope. 202 same name in the same scope.
203
204* bug 5140 fixed - lines to be executed were not printed in the console.
205 A message box added to advice to use ""Execute into Scilab",
206 if file is very long (more 100 lines).
201 207
202* bug 5466 fixed - "savematfile" no more append variables in file by default, 208* bug 5466 fixed - "savematfile" no more append variables in file by default,
203 file is now reinitialized at each "savematfile" call. 209 file is now reinitialized at each "savematfile" call.
@@ -243,6 +249,10 @@ Bug Fixes:
243* bug 6790 fixed - toprint(nFigure): %F was returned while actually the figure 249* bug 6790 fixed - toprint(nFigure): %F was returned while actually the figure
244 is printed. 250 is printed.
245 251
252* bug 6821 fixed - in text editor, labels of contextual menu called
253 "Execute selection into Scilab" and menu called
254 "Evaluate selection" were not homogenized.
255
246* bug 6864 partially fixed - ATOMS: Error messages were not homogenized. 256* bug 6864 partially fixed - ATOMS: Error messages were not homogenized.
247 257
248* bug 6879 fixed - Error messages in "sci_champ.c" were not homogenized. 258* bug 6879 fixed - Error messages in "sci_champ.c" were not homogenized.
diff --git a/scilab/Makefile.incl.am b/scilab/Makefile.incl.am
index 6f64624..b0a9ee1 100644
--- a/scilab/Makefile.incl.am
+++ b/scilab/Makefile.incl.am
@@ -252,6 +252,7 @@ install-data-local:
252 if test -d $(srcdir)/$$dir/; then \ 252 if test -d $(srcdir)/$$dir/; then \
253 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 253 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
254 if test -n "$(MACROSSPECIALEXT)"; then \ 254 if test -n "$(MACROSSPECIALEXT)"; then \
255 specialExtDir=""; \
255 for specialExt in $(MACROSSPECIALEXT); do \ 256 for specialExt in $(MACROSSPECIALEXT); do \
256 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 257 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
257 done; \ 258 done; \
diff --git a/scilab/libs/MALLOC/Makefile.in b/scilab/libs/MALLOC/Makefile.in
index 9b44c1c..4315b61 100644
--- a/scilab/libs/MALLOC/Makefile.in
+++ b/scilab/libs/MALLOC/Makefile.in
@@ -962,6 +962,7 @@ install-data-local:
962 if test -d $(srcdir)/$$dir/; then \ 962 if test -d $(srcdir)/$$dir/; then \
963 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 963 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
964 if test -n "$(MACROSSPECIALEXT)"; then \ 964 if test -n "$(MACROSSPECIALEXT)"; then \
965 specialExtDir=""; \
965 for specialExt in $(MACROSSPECIALEXT); do \ 966 for specialExt in $(MACROSSPECIALEXT); do \
966 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 967 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
967 done; \ 968 done; \
diff --git a/scilab/libs/doublylinkedlist/Makefile.in b/scilab/libs/doublylinkedlist/Makefile.in
index 01a43ed..1ce8738 100644
--- a/scilab/libs/doublylinkedlist/Makefile.in
+++ b/scilab/libs/doublylinkedlist/Makefile.in
@@ -945,6 +945,7 @@ install-data-local:
945 if test -d $(srcdir)/$$dir/; then \ 945 if test -d $(srcdir)/$$dir/; then \
946 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 946 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
947 if test -n "$(MACROSSPECIALEXT)"; then \ 947 if test -n "$(MACROSSPECIALEXT)"; then \
948 specialExtDir=""; \
948 for specialExt in $(MACROSSPECIALEXT); do \ 949 for specialExt in $(MACROSSPECIALEXT); do \
949 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 950 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
950 done; \ 951 done; \
diff --git a/scilab/libs/dynamiclibrary/Makefile.in b/scilab/libs/dynamiclibrary/Makefile.in
index 732f025..c6c6205 100644
--- a/scilab/libs/dynamiclibrary/Makefile.in
+++ b/scilab/libs/dynamiclibrary/Makefile.in
@@ -947,6 +947,7 @@ install-data-local:
947 if test -d $(srcdir)/$$dir/; then \ 947 if test -d $(srcdir)/$$dir/; then \
948 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 948 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
949 if test -n "$(MACROSSPECIALEXT)"; then \ 949 if test -n "$(MACROSSPECIALEXT)"; then \
950 specialExtDir=""; \
950 for specialExt in $(MACROSSPECIALEXT); do \ 951 for specialExt in $(MACROSSPECIALEXT); do \
951 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 952 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
952 done; \ 953 done; \
diff --git a/scilab/libs/hashtable/Makefile.in b/scilab/libs/hashtable/Makefile.in
index 256315b..f8954cc 100644
--- a/scilab/libs/hashtable/Makefile.in
+++ b/scilab/libs/hashtable/Makefile.in
@@ -942,6 +942,7 @@ install-data-local:
942 if test -d $(srcdir)/$$dir/; then \ 942 if test -d $(srcdir)/$$dir/; then \
943 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 943 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
944 if test -n "$(MACROSSPECIALEXT)"; then \ 944 if test -n "$(MACROSSPECIALEXT)"; then \
945 specialExtDir=""; \
945 for specialExt in $(MACROSSPECIALEXT); do \ 946 for specialExt in $(MACROSSPECIALEXT); do \
946 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 947 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
947 done; \ 948 done; \
diff --git a/scilab/libs/libst/Makefile.in b/scilab/libs/libst/Makefile.in
index 679f594..481345b 100644
--- a/scilab/libs/libst/Makefile.in
+++ b/scilab/libs/libst/Makefile.in
@@ -904,6 +904,7 @@ install-data-local:
904 if test -d $(srcdir)/$$dir/; then \ 904 if test -d $(srcdir)/$$dir/; then \
905 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 905 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
906 if test -n "$(MACROSSPECIALEXT)"; then \ 906 if test -n "$(MACROSSPECIALEXT)"; then \
907 specialExtDir=""; \
907 for specialExt in $(MACROSSPECIALEXT); do \ 908 for specialExt in $(MACROSSPECIALEXT); do \
908 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 909 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
909 done; \ 910 done; \
diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in
index 1bb45fa..70c8242 100644
--- a/scilab/modules/action_binding/Makefile.in
+++ b/scilab/modules/action_binding/Makefile.in
@@ -1081,6 +1081,7 @@ install-data-local:
1081 if test -d $(srcdir)/$$dir/; then \ 1081 if test -d $(srcdir)/$$dir/; then \
1082 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1082 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1083 if test -n "$(MACROSSPECIALEXT)"; then \ 1083 if test -n "$(MACROSSPECIALEXT)"; then \
1084 specialExtDir=""; \
1084 for specialExt in $(MACROSSPECIALEXT); do \ 1085 for specialExt in $(MACROSSPECIALEXT); do \
1085 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1086 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1086 done; \ 1087 done; \
diff --git a/scilab/modules/api_scilab/Makefile.in b/scilab/modules/api_scilab/Makefile.in
index bb18c45..866cad5 100644
--- a/scilab/modules/api_scilab/Makefile.in
+++ b/scilab/modules/api_scilab/Makefile.in
@@ -1137,6 +1137,7 @@ install-data-local:
1137 if test -d $(srcdir)/$$dir/; then \ 1137 if test -d $(srcdir)/$$dir/; then \
1138 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1138 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1139 if test -n "$(MACROSSPECIALEXT)"; then \ 1139 if test -n "$(MACROSSPECIALEXT)"; then \
1140 specialExtDir=""; \
1140 for specialExt in $(MACROSSPECIALEXT); do \ 1141 for specialExt in $(MACROSSPECIALEXT); do \
1141 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1142 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1142 done; \ 1143 done; \
diff --git a/scilab/modules/arnoldi/Makefile.in b/scilab/modules/arnoldi/Makefile.in
index 0b5b8ee..065d7b4 100644
--- a/scilab/modules/arnoldi/Makefile.in
+++ b/scilab/modules/arnoldi/Makefile.in
@@ -1309,6 +1309,7 @@ install-data-local:
1309 if test -d $(srcdir)/$$dir/; then \ 1309 if test -d $(srcdir)/$$dir/; then \
1310 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1310 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1311 if test -n "$(MACROSSPECIALEXT)"; then \ 1311 if test -n "$(MACROSSPECIALEXT)"; then \
1312 specialExtDir=""; \
1312 for specialExt in $(MACROSSPECIALEXT); do \ 1313 for specialExt in $(MACROSSPECIALEXT); do \
1313 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1314 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1314 done; \ 1315 done; \
diff --git a/scilab/modules/atoms/Makefile.in b/scilab/modules/atoms/Makefile.in
index a42a90e..d1640d3 100644
--- a/scilab/modules/atoms/Makefile.in
+++ b/scilab/modules/atoms/Makefile.in
@@ -816,6 +816,7 @@ install-data-local:
816 if test -d $(srcdir)/$$dir/; then \ 816 if test -d $(srcdir)/$$dir/; then \
817 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 817 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
818 if test -n "$(MACROSSPECIALEXT)"; then \ 818 if test -n "$(MACROSSPECIALEXT)"; then \
819 specialExtDir=""; \
819 for specialExt in $(MACROSSPECIALEXT); do \ 820 for specialExt in $(MACROSSPECIALEXT); do \
820 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 821 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
821 done; \ 822 done; \
diff --git a/scilab/modules/boolean/Makefile.in b/scilab/modules/boolean/Makefile.in
index 99127e5..e624739 100644
--- a/scilab/modules/boolean/Makefile.in
+++ b/scilab/modules/boolean/Makefile.in
@@ -1114,6 +1114,7 @@ install-data-local:
1114 if test -d $(srcdir)/$$dir/; then \ 1114 if test -d $(srcdir)/$$dir/; then \
1115 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1115 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1116 if test -n "$(MACROSSPECIALEXT)"; then \ 1116 if test -n "$(MACROSSPECIALEXT)"; then \
1117 specialExtDir=""; \
1117 for specialExt in $(MACROSSPECIALEXT); do \ 1118 for specialExt in $(MACROSSPECIALEXT); do \
1118 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1119 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1119 done; \ 1120 done; \
diff --git a/scilab/modules/cacsd/Makefile.in b/scilab/modules/cacsd/Makefile.in
index 89c73b4..d24e5d3 100644
--- a/scilab/modules/cacsd/Makefile.in
+++ b/scilab/modules/cacsd/Makefile.in
@@ -1977,6 +1977,7 @@ install-data-local:
1977 if test -d $(srcdir)/$$dir/; then \ 1977 if test -d $(srcdir)/$$dir/; then \
1978 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1978 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1979 if test -n "$(MACROSSPECIALEXT)"; then \ 1979 if test -n "$(MACROSSPECIALEXT)"; then \
1980 specialExtDir=""; \
1980 for specialExt in $(MACROSSPECIALEXT); do \ 1981 for specialExt in $(MACROSSPECIALEXT); do \
1981 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1982 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1982 done; \ 1983 done; \
diff --git a/scilab/modules/call_scilab/Makefile.in b/scilab/modules/call_scilab/Makefile.in
index 67c21db..34bd80c 100644
--- a/scilab/modules/call_scilab/Makefile.in
+++ b/scilab/modules/call_scilab/Makefile.in
@@ -1113,6 +1113,7 @@ install-data-local:
1113 if test -d $(srcdir)/$$dir/; then \ 1113 if test -d $(srcdir)/$$dir/; then \
1114 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1114 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1115 if test -n "$(MACROSSPECIALEXT)"; then \ 1115 if test -n "$(MACROSSPECIALEXT)"; then \
1116 specialExtDir=""; \
1116 for specialExt in $(MACROSSPECIALEXT); do \ 1117 for specialExt in $(MACROSSPECIALEXT); do \
1117 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1118 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1118 done; \ 1119 done; \
diff --git a/scilab/modules/compatibility_functions/Makefile.in b/scilab/modules/compatibility_functions/Makefile.in
index 482c7d9..587bc5f 100644
--- a/scilab/modules/compatibility_functions/Makefile.in
+++ b/scilab/modules/compatibility_functions/Makefile.in
@@ -817,6 +817,7 @@ install-data-local:
817 if test -d $(srcdir)/$$dir/; then \ 817 if test -d $(srcdir)/$$dir/; then \
818 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 818 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
819 if test -n "$(MACROSSPECIALEXT)"; then \ 819 if test -n "$(MACROSSPECIALEXT)"; then \
820 specialExtDir=""; \
820 for specialExt in $(MACROSSPECIALEXT); do \ 821 for specialExt in $(MACROSSPECIALEXT); do \
821 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 822 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
822 done; \ 823 done; \
diff --git a/scilab/modules/completion/Makefile.in b/scilab/modules/completion/Makefile.in
index 42dc95b..68a1f59 100644
--- a/scilab/modules/completion/Makefile.in
+++ b/scilab/modules/completion/Makefile.in
@@ -1258,6 +1258,7 @@ install-data-local:
1258 if test -d $(srcdir)/$$dir/; then \ 1258 if test -d $(srcdir)/$$dir/; then \
1259 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1259 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1260 if test -n "$(MACROSSPECIALEXT)"; then \ 1260 if test -n "$(MACROSSPECIALEXT)"; then \
1261 specialExtDir=""; \
1261 for specialExt in $(MACROSSPECIALEXT); do \ 1262 for specialExt in $(MACROSSPECIALEXT); do \
1262 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1263 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1263 done; \ 1264 done; \
diff --git a/scilab/modules/console/Makefile.in b/scilab/modules/console/Makefile.in
index a8b8f27..9eaea3c 100644
--- a/scilab/modules/console/Makefile.in
+++ b/scilab/modules/console/Makefile.in
@@ -1231,6 +1231,7 @@ install-data-local:
1231 if test -d $(srcdir)/$$dir/; then \ 1231 if test -d $(srcdir)/$$dir/; then \
1232 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1232 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1233 if test -n "$(MACROSSPECIALEXT)"; then \ 1233 if test -n "$(MACROSSPECIALEXT)"; then \
1234 specialExtDir=""; \
1234 for specialExt in $(MACROSSPECIALEXT); do \ 1235 for specialExt in $(MACROSSPECIALEXT); do \
1235 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1236 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1236 done; \ 1237 done; \
diff --git a/scilab/modules/core/Makefile.in b/scilab/modules/core/Makefile.in
index 8c2351d..13059f4 100644
--- a/scilab/modules/core/Makefile.in
+++ b/scilab/modules/core/Makefile.in
@@ -2976,6 +2976,7 @@ install-data-local:
2976 if test -d $(srcdir)/$$dir/; then \ 2976 if test -d $(srcdir)/$$dir/; then \
2977 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 2977 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
2978 if test -n "$(MACROSSPECIALEXT)"; then \ 2978 if test -n "$(MACROSSPECIALEXT)"; then \
2979 specialExtDir=""; \
2979 for specialExt in $(MACROSSPECIALEXT); do \ 2980 for specialExt in $(MACROSSPECIALEXT); do \
2980 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 2981 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
2981 done; \ 2982 done; \
diff --git a/scilab/modules/data_structures/Makefile.in b/scilab/modules/data_structures/Makefile.in
index bf5fa0e..089c37d 100644
--- a/scilab/modules/data_structures/Makefile.in
+++ b/scilab/modules/data_structures/Makefile.in
@@ -1283,6 +1283,7 @@ install-data-local:
1283 if test -d $(srcdir)/$$dir/; then \ 1283 if test -d $(srcdir)/$$dir/; then \
1284 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1284 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1285 if test -n "$(MACROSSPECIALEXT)"; then \ 1285 if test -n "$(MACROSSPECIALEXT)"; then \
1286 specialExtDir=""; \
1286 for specialExt in $(MACROSSPECIALEXT); do \ 1287 for specialExt in $(MACROSSPECIALEXT); do \
1287 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1288 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1288 done; \ 1289 done; \
diff --git a/scilab/modules/demo_tools/Makefile.in b/scilab/modules/demo_tools/Makefile.in
index 7457de2..4913c33 100644
--- a/scilab/modules/demo_tools/Makefile.in
+++ b/scilab/modules/demo_tools/Makefile.in
@@ -841,6 +841,7 @@ install-data-local:
841 if test -d $(srcdir)/$$dir/; then \ 841 if test -d $(srcdir)/$$dir/; then \
842 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 842 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
843 if test -n "$(MACROSSPECIALEXT)"; then \ 843 if test -n "$(MACROSSPECIALEXT)"; then \
844 specialExtDir=""; \
844 for specialExt in $(MACROSSPECIALEXT); do \ 845 for specialExt in $(MACROSSPECIALEXT); do \
845 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 846 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
846 done; \ 847 done; \
diff --git a/scilab/modules/development_tools/Makefile.in b/scilab/modules/development_tools/Makefile.in
index 736a1aa..12b130b 100644
--- a/scilab/modules/development_tools/Makefile.in
+++ b/scilab/modules/development_tools/Makefile.in
@@ -813,6 +813,7 @@ install-data-local:
813 if test -d $(srcdir)/$$dir/; then \ 813 if test -d $(srcdir)/$$dir/; then \
814 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 814 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
815 if test -n "$(MACROSSPECIALEXT)"; then \ 815 if test -n "$(MACROSSPECIALEXT)"; then \
816 specialExtDir=""; \
816 for specialExt in $(MACROSSPECIALEXT); do \ 817 for specialExt in $(MACROSSPECIALEXT); do \
817 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 818 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
818 done; \ 819 done; \
diff --git a/scilab/modules/differential_equations/Makefile.in b/scilab/modules/differential_equations/Makefile.in
index 133201e..e0510b6 100644
--- a/scilab/modules/differential_equations/Makefile.in
+++ b/scilab/modules/differential_equations/Makefile.in
@@ -1660,6 +1660,7 @@ install-data-local:
1660 if test -d $(srcdir)/$$dir/; then \ 1660 if test -d $(srcdir)/$$dir/; then \
1661 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1661 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1662 if test -n "$(MACROSSPECIALEXT)"; then \ 1662 if test -n "$(MACROSSPECIALEXT)"; then \
1663 specialExtDir=""; \
1663 for specialExt in $(MACROSSPECIALEXT); do \ 1664 for specialExt in $(MACROSSPECIALEXT); do \
1664 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1665 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1665 done; \ 1666 done; \
diff --git a/scilab/modules/double/Makefile.in b/scilab/modules/double/Makefile.in
index 55fc80b..b1b6c90 100644
--- a/scilab/modules/double/Makefile.in
+++ b/scilab/modules/double/Makefile.in
@@ -1083,6 +1083,7 @@ install-data-local:
1083 if test -d $(srcdir)/$$dir/; then \ 1083 if test -d $(srcdir)/$$dir/; then \
1084 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1084 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1085 if test -n "$(MACROSSPECIALEXT)"; then \ 1085 if test -n "$(MACROSSPECIALEXT)"; then \
1086 specialExtDir=""; \
1086 for specialExt in $(MACROSSPECIALEXT); do \ 1087 for specialExt in $(MACROSSPECIALEXT); do \
1087 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1088 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1088 done; \ 1089 done; \
diff --git a/scilab/modules/dynamic_link/Makefile.in b/scilab/modules/dynamic_link/Makefile.in
index 4d11066..e7121d2 100644
--- a/scilab/modules/dynamic_link/Makefile.in
+++ b/scilab/modules/dynamic_link/Makefile.in
@@ -1254,6 +1254,7 @@ install-data-local:
1254 if test -d $(srcdir)/$$dir/; then \ 1254 if test -d $(srcdir)/$$dir/; then \
1255 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1255 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1256 if test -n "$(MACROSSPECIALEXT)"; then \ 1256 if test -n "$(MACROSSPECIALEXT)"; then \
1257 specialExtDir=""; \
1257 for specialExt in $(MACROSSPECIALEXT); do \ 1258 for specialExt in $(MACROSSPECIALEXT); do \
1258 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1259 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1259 done; \ 1260 done; \
diff --git a/scilab/modules/elementary_functions/Makefile.in b/scilab/modules/elementary_functions/Makefile.in
index 0db03e5..c5d9671 100644
--- a/scilab/modules/elementary_functions/Makefile.in
+++ b/scilab/modules/elementary_functions/Makefile.in
@@ -3219,6 +3219,7 @@ install-data-local:
3219 if test -d $(srcdir)/$$dir/; then \ 3219 if test -d $(srcdir)/$$dir/; then \
3220 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 3220 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
3221 if test -n "$(MACROSSPECIALEXT)"; then \ 3221 if test -n "$(MACROSSPECIALEXT)"; then \
3222 specialExtDir=""; \
3222 for specialExt in $(MACROSSPECIALEXT); do \ 3223 for specialExt in $(MACROSSPECIALEXT); do \
3223 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 3224 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
3224 done; \ 3225 done; \
diff --git a/scilab/modules/fftw/Makefile.in b/scilab/modules/fftw/Makefile.in
index ccbd1b1..e01dfa4 100644
--- a/scilab/modules/fftw/Makefile.in
+++ b/scilab/modules/fftw/Makefile.in
@@ -1167,6 +1167,7 @@ install-data-local:
1167 if test -d $(srcdir)/$$dir/; then \ 1167 if test -d $(srcdir)/$$dir/; then \
1168 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1168 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1169 if test -n "$(MACROSSPECIALEXT)"; then \ 1169 if test -n "$(MACROSSPECIALEXT)"; then \
1170 specialExtDir=""; \
1170 for specialExt in $(MACROSSPECIALEXT); do \ 1171 for specialExt in $(MACROSSPECIALEXT); do \
1171 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1172 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1172 done; \ 1173 done; \
diff --git a/scilab/modules/fileio/Makefile.in b/scilab/modules/fileio/Makefile.in
index 1b69eb3..a281b6e 100644
--- a/scilab/modules/fileio/Makefile.in
+++ b/scilab/modules/fileio/Makefile.in
@@ -1891,6 +1891,7 @@ install-data-local:
1891 if test -d $(srcdir)/$$dir/; then \ 1891 if test -d $(srcdir)/$$dir/; then \
1892 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1892 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1893 if test -n "$(MACROSSPECIALEXT)"; then \ 1893 if test -n "$(MACROSSPECIALEXT)"; then \
1894 specialExtDir=""; \
1894 for specialExt in $(MACROSSPECIALEXT); do \ 1895 for specialExt in $(MACROSSPECIALEXT); do \
1895 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1896 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1896 done; \ 1897 done; \
diff --git a/scilab/modules/functions/Makefile.in b/scilab/modules/functions/Makefile.in
index 510643a..e0c6659 100644
--- a/scilab/modules/functions/Makefile.in
+++ b/scilab/modules/functions/Makefile.in
@@ -1173,6 +1173,7 @@ install-data-local:
1173 if test -d $(srcdir)/$$dir/; then \ 1173 if test -d $(srcdir)/$$dir/; then \
1174 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1174 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1175 if test -n "$(MACROSSPECIALEXT)"; then \ 1175 if test -n "$(MACROSSPECIALEXT)"; then \
1176 specialExtDir=""; \
1176 for specialExt in $(MACROSSPECIALEXT); do \ 1177 for specialExt in $(MACROSSPECIALEXT); do \
1177 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1178 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1178 done; \ 1179 done; \
diff --git a/scilab/modules/genetic_algorithms/Makefile.in b/scilab/modules/genetic_algorithms/Makefile.in
index 27bb2a7..26f12c5 100644
--- a/scilab/modules/genetic_algorithms/Makefile.in
+++ b/scilab/modules/genetic_algorithms/Makefile.in
@@ -818,6 +818,7 @@ install-data-local:
818 if test -d $(srcdir)/$$dir/; then \ 818 if test -d $(srcdir)/$$dir/; then \
819 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 819 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
820 if test -n "$(MACROSSPECIALEXT)"; then \ 820 if test -n "$(MACROSSPECIALEXT)"; then \
821 specialExtDir=""; \
821 for specialExt in $(MACROSSPECIALEXT); do \ 822 for specialExt in $(MACROSSPECIALEXT); do \
822 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 823 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
823 done; \ 824 done; \
diff --git a/scilab/modules/graphic_export/Makefile.in b/scilab/modules/graphic_export/Makefile.in
index 63ac660..c054527 100644
--- a/scilab/modules/graphic_export/Makefile.in
+++ b/scilab/modules/graphic_export/Makefile.in
@@ -1325,6 +1325,7 @@ install-data-local:
1325 if test -d $(srcdir)/$$dir/; then \ 1325 if test -d $(srcdir)/$$dir/; then \
1326 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1326 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1327 if test -n "$(MACROSSPECIALEXT)"; then \ 1327 if test -n "$(MACROSSPECIALEXT)"; then \
1328 specialExtDir=""; \
1328 for specialExt in $(MACROSSPECIALEXT); do \ 1329 for specialExt in $(MACROSSPECIALEXT); do \
1329 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1330 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1330 done; \ 1331 done; \
diff --git a/scilab/modules/graphics/Makefile.in b/scilab/modules/graphics/Makefile.in
index b100e37..8c9baa9 100644
--- a/scilab/modules/graphics/Makefile.in
+++ b/scilab/modules/graphics/Makefile.in
@@ -4866,6 +4866,7 @@ install-data-local:
4866 if test -d $(srcdir)/$$dir/; then \ 4866 if test -d $(srcdir)/$$dir/; then \
4867 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 4867 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
4868 if test -n "$(MACROSSPECIALEXT)"; then \ 4868 if test -n "$(MACROSSPECIALEXT)"; then \
4869 specialExtDir=""; \
4869 for specialExt in $(MACROSSPECIALEXT); do \ 4870 for specialExt in $(MACROSSPECIALEXT); do \
4870 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 4871 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
4871 done; \ 4872 done; \
diff --git a/scilab/modules/graphics/src/c/sciCall.c b/scilab/modules/graphics/src/c/sciCall.c
index 3c6fa14..227ec11 100644
--- a/scilab/modules/graphics/src/c/sciCall.c
+++ b/scilab/modules/graphics/src/c/sciCall.c
@@ -39,6 +39,7 @@
39#include "DrawingBridge.h" 39#include "DrawingBridge.h"
40#include "Plot2d.h" 40#include "Plot2d.h"
41#include "HandleManagement.h" 41#include "HandleManagement.h"
42#include "stack-def.h" /* bsiz */
42 43
43/** 44/**
44 * Put min and max of vector in dMin and dMax. 45 * Put min and max of vector in dMin and dMax.
diff --git a/scilab/modules/gui/Makefile.in b/scilab/modules/gui/Makefile.in
index 4ad1e38..72791ba 100644
--- a/scilab/modules/gui/Makefile.in
+++ b/scilab/modules/gui/Makefile.in
@@ -2563,6 +2563,7 @@ install-data-local:
2563 if test -d $(srcdir)/$$dir/; then \ 2563 if test -d $(srcdir)/$$dir/; then \
2564 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 2564 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
2565 if test -n "$(MACROSSPECIALEXT)"; then \ 2565 if test -n "$(MACROSSPECIALEXT)"; then \
2566 specialExtDir=""; \
2566 for specialExt in $(MACROSSPECIALEXT); do \ 2567 for specialExt in $(MACROSSPECIALEXT); do \
2567 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 2568 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
2568 done; \ 2569 done; \
diff --git a/scilab/modules/hdf5/Makefile.in b/scilab/modules/hdf5/Makefile.in
index 2dae2ca..4cfa1be 100644
--- a/scilab/modules/hdf5/Makefile.in
+++ b/scilab/modules/hdf5/Makefile.in
@@ -1239,6 +1239,7 @@ install-data-local:
1239 if test -d $(srcdir)/$$dir/; then \ 1239 if test -d $(srcdir)/$$dir/; then \
1240 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1240 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1241 if test -n "$(MACROSSPECIALEXT)"; then \ 1241 if test -n "$(MACROSSPECIALEXT)"; then \
1242 specialExtDir=""; \
1242 for specialExt in $(MACROSSPECIALEXT); do \ 1243 for specialExt in $(MACROSSPECIALEXT); do \
1243 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1244 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1244 done; \ 1245 done; \
diff --git a/scilab/modules/helptools/Makefile.in b/scilab/modules/helptools/Makefile.in
index 6d9476c..579339f 100644
--- a/scilab/modules/helptools/Makefile.in
+++ b/scilab/modules/helptools/Makefile.in
@@ -1435,6 +1435,7 @@ install-data-local:
1435 if test -d $(srcdir)/$$dir/; then \ 1435 if test -d $(srcdir)/$$dir/; then \
1436 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1436 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1437 if test -n "$(MACROSSPECIALEXT)"; then \ 1437 if test -n "$(MACROSSPECIALEXT)"; then \
1438 specialExtDir=""; \
1438 for specialExt in $(MACROSSPECIALEXT); do \ 1439 for specialExt in $(MACROSSPECIALEXT); do \
1439 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1440 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1440 done; \ 1441 done; \
diff --git a/scilab/modules/history_manager/Makefile.in b/scilab/modules/history_manager/Makefile.in
index 3757b7a..ee7065f 100644
--- a/scilab/modules/history_manager/Makefile.in
+++ b/scilab/modules/history_manager/Makefile.in
@@ -1334,6 +1334,7 @@ install-data-local:
1334 if test -d $(srcdir)/$$dir/; then \ 1334 if test -d $(srcdir)/$$dir/; then \
1335 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1335 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1336 if test -n "$(MACROSSPECIALEXT)"; then \ 1336 if test -n "$(MACROSSPECIALEXT)"; then \
1337 specialExtDir=""; \
1337 for specialExt in $(MACROSSPECIALEXT); do \ 1338 for specialExt in $(MACROSSPECIALEXT); do \
1338 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1339 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1339 done; \ 1340 done; \
diff --git a/scilab/modules/integer/Makefile.in b/scilab/modules/integer/Makefile.in
index 5755cc7..043f1d9 100644
--- a/scilab/modules/integer/Makefile.in
+++ b/scilab/modules/integer/Makefile.in
@@ -1708,6 +1708,7 @@ install-data-local:
1708 if test -d $(srcdir)/$$dir/; then \ 1708 if test -d $(srcdir)/$$dir/; then \
1709 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1709 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1710 if test -n "$(MACROSSPECIALEXT)"; then \ 1710 if test -n "$(MACROSSPECIALEXT)"; then \
1711 specialExtDir=""; \
1711 for specialExt in $(MACROSSPECIALEXT); do \ 1712 for specialExt in $(MACROSSPECIALEXT); do \
1712 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1713 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1713 done; \ 1714 done; \
diff --git a/scilab/modules/interpolation/Makefile.in b/scilab/modules/interpolation/Makefile.in
index f68c012..260b75c 100644
--- a/scilab/modules/interpolation/Makefile.in
+++ b/scilab/modules/interpolation/Makefile.in
@@ -1188,6 +1188,7 @@ install-data-local:
1188 if test -d $(srcdir)/$$dir/; then \ 1188 if test -d $(srcdir)/$$dir/; then \
1189 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1189 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1190 if test -n "$(MACROSSPECIALEXT)"; then \ 1190 if test -n "$(MACROSSPECIALEXT)"; then \
1191 specialExtDir=""; \
1191 for specialExt in $(MACROSSPECIALEXT); do \ 1192 for specialExt in $(MACROSSPECIALEXT); do \
1192 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1193 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1193 done; \ 1194 done; \
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index 1be051c..1c4fe5a 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -1262,6 +1262,7 @@ install-data-local:
1262 if test -d $(srcdir)/$$dir/; then \ 1262 if test -d $(srcdir)/$$dir/; then \
1263 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1263 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1264 if test -n "$(MACROSSPECIALEXT)"; then \ 1264 if test -n "$(MACROSSPECIALEXT)"; then \
1265 specialExtDir=""; \
1265 for specialExt in $(MACROSSPECIALEXT); do \ 1266 for specialExt in $(MACROSSPECIALEXT); do \
1266 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1267 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1267 done; \ 1268 done; \
diff --git a/scilab/modules/io/Makefile.in b/scilab/modules/io/Makefile.in
index 5337608..68a3c7a 100644
--- a/scilab/modules/io/Makefile.in
+++ b/scilab/modules/io/Makefile.in
@@ -1327,6 +1327,7 @@ install-data-local:
1327 if test -d $(srcdir)/$$dir/; then \ 1327 if test -d $(srcdir)/$$dir/; then \
1328 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1328 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1329 if test -n "$(MACROSSPECIALEXT)"; then \ 1329 if test -n "$(MACROSSPECIALEXT)"; then \
1330 specialExtDir=""; \
1330 for specialExt in $(MACROSSPECIALEXT); do \ 1331 for specialExt in $(MACROSSPECIALEXT); do \
1331 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1332 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1332 done; \ 1333 done; \
diff --git a/scilab/modules/javasci/Makefile.in b/scilab/modules/javasci/Makefile.in
index 67f7af3..6409d24 100644
--- a/scilab/modules/javasci/Makefile.in
+++ b/scilab/modules/javasci/Makefile.in
@@ -1196,6 +1196,7 @@ uninstall-am: uninstall-libjavasci_la_etcDATA \
1196@JAVASCI_TRUE@ if test -d $(srcdir)/$$dir/; then \ 1196@JAVASCI_TRUE@ if test -d $(srcdir)/$$dir/; then \
1197@JAVASCI_TRUE@ FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1197@JAVASCI_TRUE@ FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1198@JAVASCI_TRUE@ if test -n "$(MACROSSPECIALEXT)"; then \ 1198@JAVASCI_TRUE@ if test -n "$(MACROSSPECIALEXT)"; then \
1199@JAVASCI_TRUE@ specialExtDir=""; \
1199@JAVASCI_TRUE@ for specialExt in $(MACROSSPECIALEXT); do \ 1200@JAVASCI_TRUE@ for specialExt in $(MACROSSPECIALEXT); do \
1200@JAVASCI_TRUE@ specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1201@JAVASCI_TRUE@ specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1201@JAVASCI_TRUE@ done; \ 1202@JAVASCI_TRUE@ done; \
diff --git a/scilab/modules/jvm/Makefile.in b/scilab/modules/jvm/Makefile.in
index ecc2a4b..eb253f7 100644
--- a/scilab/modules/jvm/Makefile.in
+++ b/scilab/modules/jvm/Makefile.in
@@ -1317,6 +1317,7 @@ install-data-local:
1317 if test -d $(srcdir)/$$dir/; then \ 1317 if test -d $(srcdir)/$$dir/; then \
1318 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1318 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1319 if test -n "$(MACROSSPECIALEXT)"; then \ 1319 if test -n "$(MACROSSPECIALEXT)"; then \
1320 specialExtDir=""; \
1320 for specialExt in $(MACROSSPECIALEXT); do \ 1321 for specialExt in $(MACROSSPECIALEXT); do \
1321 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1322 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1322 done; \ 1323 done; \
diff --git a/scilab/modules/linear_algebra/Makefile.in b/scilab/modules/linear_algebra/Makefile.in
index 11262ab..de37c71 100644
--- a/scilab/modules/linear_algebra/Makefile.in
+++ b/scilab/modules/linear_algebra/Makefile.in
@@ -1511,6 +1511,7 @@ install-data-local:
1511 if test -d $(srcdir)/$$dir/; then \ 1511 if test -d $(srcdir)/$$dir/; then \
1512 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1512 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1513 if test -n "$(MACROSSPECIALEXT)"; then \ 1513 if test -n "$(MACROSSPECIALEXT)"; then \
1514 specialExtDir=""; \
1514 for specialExt in $(MACROSSPECIALEXT); do \ 1515 for specialExt in $(MACROSSPECIALEXT); do \
1515 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1516 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1516 done; \ 1517 done; \
diff --git a/scilab/modules/localization/Makefile.in b/scilab/modules/localization/Makefile.in
index f0b7b16..a5e5360 100644
--- a/scilab/modules/localization/Makefile.in
+++ b/scilab/modules/localization/Makefile.in
@@ -1188,6 +1188,7 @@ install-data-local:
1188 if test -d $(srcdir)/$$dir/; then \ 1188 if test -d $(srcdir)/$$dir/; then \
1189 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1189 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1190 if test -n "$(MACROSSPECIALEXT)"; then \ 1190 if test -n "$(MACROSSPECIALEXT)"; then \
1191 specialExtDir=""; \
1191 for specialExt in $(MACROSSPECIALEXT); do \ 1192 for specialExt in $(MACROSSPECIALEXT); do \
1192 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1193 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1193 done; \ 1194 done; \
diff --git a/scilab/modules/m2sci/Makefile.in b/scilab/modules/m2sci/Makefile.in
index 973b373..14ed174 100644
--- a/scilab/modules/m2sci/Makefile.in
+++ b/scilab/modules/m2sci/Makefile.in
@@ -813,6 +813,7 @@ install-data-local:
813 if test -d $(srcdir)/$$dir/; then \ 813 if test -d $(srcdir)/$$dir/; then \
814 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 814 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
815 if test -n "$(MACROSSPECIALEXT)"; then \ 815 if test -n "$(MACROSSPECIALEXT)"; then \
816 specialExtDir=""; \
816 for specialExt in $(MACROSSPECIALEXT); do \ 817 for specialExt in $(MACROSSPECIALEXT); do \
817 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 818 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
818 done; \ 819 done; \
diff --git a/scilab/modules/maple2scilab/Makefile.in b/scilab/modules/maple2scilab/Makefile.in
index 48cb10c..8dd5649 100644
--- a/scilab/modules/maple2scilab/Makefile.in
+++ b/scilab/modules/maple2scilab/Makefile.in
@@ -811,6 +811,7 @@ install-data-local:
811 if test -d $(srcdir)/$$dir/; then \ 811 if test -d $(srcdir)/$$dir/; then \
812 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 812 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
813 if test -n "$(MACROSSPECIALEXT)"; then \ 813 if test -n "$(MACROSSPECIALEXT)"; then \
814 specialExtDir=""; \
814 for specialExt in $(MACROSSPECIALEXT); do \ 815 for specialExt in $(MACROSSPECIALEXT); do \
815 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 816 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
816 done; \ 817 done; \
diff --git a/scilab/modules/matio/Makefile.in b/scilab/modules/matio/Makefile.in
index b6c0386..ed6f6ae 100644
--- a/scilab/modules/matio/Makefile.in
+++ b/scilab/modules/matio/Makefile.in
@@ -1268,6 +1268,7 @@ install-data-local:
1268 if test -d $(srcdir)/$$dir/; then \ 1268 if test -d $(srcdir)/$$dir/; then \
1269 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1269 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1270 if test -n "$(MACROSSPECIALEXT)"; then \ 1270 if test -n "$(MACROSSPECIALEXT)"; then \
1271 specialExtDir=""; \
1271 for specialExt in $(MACROSSPECIALEXT); do \ 1272 for specialExt in $(MACROSSPECIALEXT); do \
1272 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1273 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1273 done; \ 1274 done; \
diff --git a/scilab/modules/mexlib/Makefile.in b/scilab/modules/mexlib/Makefile.in
index a1864b2..be94ed5 100644
--- a/scilab/modules/mexlib/Makefile.in
+++ b/scilab/modules/mexlib/Makefile.in
@@ -1080,6 +1080,7 @@ install-data-local:
1080 if test -d $(srcdir)/$$dir/; then \ 1080 if test -d $(srcdir)/$$dir/; then \
1081 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1081 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1082 if test -n "$(MACROSSPECIALEXT)"; then \ 1082 if test -n "$(MACROSSPECIALEXT)"; then \
1083 specialExtDir=""; \
1083 for specialExt in $(MACROSSPECIALEXT); do \ 1084 for specialExt in $(MACROSSPECIALEXT); do \
1084 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1085 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1085 done; \ 1086 done; \
diff --git a/scilab/modules/optimization/Makefile.in b/scilab/modules/optimization/Makefile.in
index c148ce3..3fa64c3 100644
--- a/scilab/modules/optimization/Makefile.in
+++ b/scilab/modules/optimization/Makefile.in
@@ -1563,6 +1563,7 @@ install-data-local:
1563 if test -d $(srcdir)/$$dir/; then \ 1563 if test -d $(srcdir)/$$dir/; then \
1564 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1564 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1565 if test -n "$(MACROSSPECIALEXT)"; then \ 1565 if test -n "$(MACROSSPECIALEXT)"; then \
1566 specialExtDir=""; \
1566 for specialExt in $(MACROSSPECIALEXT); do \ 1567 for specialExt in $(MACROSSPECIALEXT); do \
1567 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1568 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1568 done; \ 1569 done; \
diff --git a/scilab/modules/output_stream/Makefile.in b/scilab/modules/output_stream/Makefile.in
index 613b808..bf6471e 100644
--- a/scilab/modules/output_stream/Makefile.in
+++ b/scilab/modules/output_stream/Makefile.in
@@ -1438,6 +1438,7 @@ install-data-local:
1438 if test -d $(srcdir)/$$dir/; then \ 1438 if test -d $(srcdir)/$$dir/; then \
1439 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1439 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1440 if test -n "$(MACROSSPECIALEXT)"; then \ 1440 if test -n "$(MACROSSPECIALEXT)"; then \
1441 specialExtDir=""; \
1441 for specialExt in $(MACROSSPECIALEXT); do \ 1442 for specialExt in $(MACROSSPECIALEXT); do \
1442 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1443 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1443 done; \ 1444 done; \
diff --git a/scilab/modules/overloading/Makefile.in b/scilab/modules/overloading/Makefile.in
index 65029cc..5939376 100644
--- a/scilab/modules/overloading/Makefile.in
+++ b/scilab/modules/overloading/Makefile.in
@@ -813,6 +813,7 @@ install-data-local:
813 if test -d $(srcdir)/$$dir/; then \ 813 if test -d $(srcdir)/$$dir/; then \
814 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 814 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
815 if test -n "$(MACROSSPECIALEXT)"; then \ 815 if test -n "$(MACROSSPECIALEXT)"; then \
816 specialExtDir=""; \
816 for specialExt in $(MACROSSPECIALEXT); do \ 817 for specialExt in $(MACROSSPECIALEXT); do \
817 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 818 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
818 done; \ 819 done; \
diff --git a/scilab/modules/parameters/Makefile.in b/scilab/modules/parameters/Makefile.in
index e08ee06..4f75c15 100644
--- a/scilab/modules/parameters/Makefile.in
+++ b/scilab/modules/parameters/Makefile.in
@@ -815,6 +815,7 @@ install-data-local:
815 if test -d $(srcdir)/$$dir/; then \ 815 if test -d $(srcdir)/$$dir/; then \
816 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 816 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
817 if test -n "$(MACROSSPECIALEXT)"; then \ 817 if test -n "$(MACROSSPECIALEXT)"; then \
818 specialExtDir=""; \
818 for specialExt in $(MACROSSPECIALEXT); do \ 819 for specialExt in $(MACROSSPECIALEXT); do \
819 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 820 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
820 done; \ 821 done; \
diff --git a/scilab/modules/polynomials/Makefile.in b/scilab/modules/polynomials/Makefile.in
index d6efa1f..78be85a 100644
--- a/scilab/modules/polynomials/Makefile.in
+++ b/scilab/modules/polynomials/Makefile.in
@@ -1517,6 +1517,7 @@ install-data-local:
1517 if test -d $(srcdir)/$$dir/; then \ 1517 if test -d $(srcdir)/$$dir/; then \
1518 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1518 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1519 if test -n "$(MACROSSPECIALEXT)"; then \ 1519 if test -n "$(MACROSSPECIALEXT)"; then \
1520 specialExtDir=""; \
1520 for specialExt in $(MACROSSPECIALEXT); do \ 1521 for specialExt in $(MACROSSPECIALEXT); do \
1521 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1522 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1522 done; \ 1523 done; \
diff --git a/scilab/modules/pvm/Makefile.in b/scilab/modules/pvm/Makefile.in
index ba7ccaa..8c926bc 100644
--- a/scilab/modules/pvm/Makefile.in
+++ b/scilab/modules/pvm/Makefile.in
@@ -1551,6 +1551,7 @@ uninstall-am: uninstall-libscipvm_la_etcDATA \
1551@PVM_TRUE@ if test -d $(srcdir)/$$dir/; then \ 1551@PVM_TRUE@ if test -d $(srcdir)/$$dir/; then \
1552@PVM_TRUE@ FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1552@PVM_TRUE@ FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1553@PVM_TRUE@ if test -n "$(MACROSSPECIALEXT)"; then \ 1553@PVM_TRUE@ if test -n "$(MACROSSPECIALEXT)"; then \
1554@PVM_TRUE@ specialExtDir=""; \
1554@PVM_TRUE@ for specialExt in $(MACROSSPECIALEXT); do \ 1555@PVM_TRUE@ for specialExt in $(MACROSSPECIALEXT); do \
1555@PVM_TRUE@ specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1556@PVM_TRUE@ specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1556@PVM_TRUE@ done; \ 1557@PVM_TRUE@ done; \
@@ -1735,6 +1736,7 @@ uninstall-am: uninstall-libscipvm_la_etcDATA \
1735@PVM_FALSE@ if test -d $(srcdir)/$$dir/; then \ 1736@PVM_FALSE@ if test -d $(srcdir)/$$dir/; then \
1736@PVM_FALSE@ FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1737@PVM_FALSE@ FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1737@PVM_FALSE@ if test -n "$(MACROSSPECIALEXT)"; then \ 1738@PVM_FALSE@ if test -n "$(MACROSSPECIALEXT)"; then \
1739@PVM_FALSE@ specialExtDir=""; \
1738@PVM_FALSE@ for specialExt in $(MACROSSPECIALEXT); do \ 1740@PVM_FALSE@ for specialExt in $(MACROSSPECIALEXT); do \
1739@PVM_FALSE@ specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1741@PVM_FALSE@ specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1740@PVM_FALSE@ done; \ 1742@PVM_FALSE@ done; \
diff --git a/scilab/modules/randlib/Makefile.in b/scilab/modules/randlib/Makefile.in
index f275e11..727361e 100644
--- a/scilab/modules/randlib/Makefile.in
+++ b/scilab/modules/randlib/Makefile.in
@@ -1220,6 +1220,7 @@ install-data-local:
1220 if test -d $(srcdir)/$$dir/; then \ 1220 if test -d $(srcdir)/$$dir/; then \
1221 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1221 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1222 if test -n "$(MACROSSPECIALEXT)"; then \ 1222 if test -n "$(MACROSSPECIALEXT)"; then \
1223 specialExtDir=""; \
1223 for specialExt in $(MACROSSPECIALEXT); do \ 1224 for specialExt in $(MACROSSPECIALEXT); do \
1224 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1225 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1225 done; \ 1226 done; \
diff --git a/scilab/modules/renderer/Makefile.in b/scilab/modules/renderer/Makefile.in
index 2176a10..a045f98 100644
--- a/scilab/modules/renderer/Makefile.in
+++ b/scilab/modules/renderer/Makefile.in
@@ -3631,6 +3631,7 @@ install-data-local:
3631 if test -d $(srcdir)/$$dir/; then \ 3631 if test -d $(srcdir)/$$dir/; then \
3632 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 3632 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
3633 if test -n "$(MACROSSPECIALEXT)"; then \ 3633 if test -n "$(MACROSSPECIALEXT)"; then \
3634 specialExtDir=""; \
3634 for specialExt in $(MACROSSPECIALEXT); do \ 3635 for specialExt in $(MACROSSPECIALEXT); do \
3635 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 3636 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
3636 done; \ 3637 done; \
diff --git a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/textDrawing/SpecialTextObjectGL.java b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/textDrawing/SpecialTextObjectGL.java
index cdd33fc..d6fe1e0 100644
--- a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/textDrawing/SpecialTextObjectGL.java
+++ b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/textDrawing/SpecialTextObjectGL.java
@@ -16,8 +16,19 @@ import java.awt.Color;
16 16
17import com.sun.opengl.util.texture.Texture; 17import com.sun.opengl.util.texture.Texture;
18 18
19/**
20 * Special text object
21 * @author Calixte Denizet
22 */
19public abstract class SpecialTextObjectGL { 23public abstract class SpecialTextObjectGL {
20 24
25 private static final int ALPHA_SHIFT = 24;
26 private static final int RED_SHIFT = 16;
27 private static final int GREEN_SHIFT = 8;
28 private static final int BLUE_SHIFT = 0;
29 private static final int COMPONENT_MASK = 0xFF;
30 private static final int NB_COMPONENTS = 4;
31
21 protected Buffer buffer; 32 protected Buffer buffer;
22 protected float height; 33 protected float height;
23 protected float width; 34 protected float width;
@@ -25,6 +36,9 @@ public abstract class SpecialTextObjectGL {
25 36
26 protected boolean isColored; 37 protected boolean isColored;
27 38
39 /**
40 * Default constructor
41 */
28 public SpecialTextObjectGL() { 42 public SpecialTextObjectGL() {
29 } 43 }
30 44
@@ -115,20 +129,21 @@ public abstract class SpecialTextObjectGL {
115 * @return pixmap RGBA data 129 * @return pixmap RGBA data
116 */ 130 */
117 protected static byte[] ARGBtoRGBA(int[] pix) { 131 protected static byte[] ARGBtoRGBA(int[] pix) {
118 byte[] bytes = new byte[pix.length * 4]; 132 byte[] bytes = new byte[pix.length * NB_COMPONENTS];
119 int p, r, g, b, a; 133 int p;
134 int [] tmpPix = new int[NB_COMPONENTS];
120 int j = 0; 135 int j = 0;
121 for (int i = 0; i < pix.length; i++) { 136 for (int i = 0; i < pix.length; i++) {
122 p = pix[i]; 137 p = pix[i];
123 a = (p >> 24) & 0xFF; 138 tmpPix[0] = (p >> ALPHA_SHIFT) & COMPONENT_MASK;
124 r = (p >> 16) & 0xFF; 139 tmpPix[1] = (p >> RED_SHIFT) & COMPONENT_MASK;
125 g = (p >> 8) & 0xFF; 140 tmpPix[2] = (p >> GREEN_SHIFT) & COMPONENT_MASK;
126 b = (p >> 0) & 0xFF; 141 tmpPix[NB_COMPONENTS - 1] = (p >> BLUE_SHIFT) & COMPONENT_MASK;
127 bytes[j] = (byte) r; 142 bytes[j] = (byte) tmpPix[1];
128 bytes[j + 1] = (byte) g; 143 bytes[j + 1] = (byte) tmpPix[2];
129 bytes[j + 2] = (byte) b; 144 bytes[j + 2] = (byte) tmpPix[NB_COMPONENTS - 1];
130 bytes[j + 3] = (byte) a; 145 bytes[j + NB_COMPONENTS - 1] = (byte) tmpPix[0];
131 j += 4; 146 j += NB_COMPONENTS;
132 } 147 }
133 148
134 return bytes; 149 return bytes;
diff --git a/scilab/modules/scicos/Makefile.in b/scilab/modules/scicos/Makefile.in
index 8b79666..4511fcd 100644
--- a/scilab/modules/scicos/Makefile.in
+++ b/scilab/modules/scicos/Makefile.in
@@ -2355,6 +2355,7 @@ install-data-local:
2355 if test -d $(srcdir)/$$dir/; then \ 2355 if test -d $(srcdir)/$$dir/; then \
2356 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 2356 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
2357 if test -n "$(MACROSSPECIALEXT)"; then \ 2357 if test -n "$(MACROSSPECIALEXT)"; then \
2358 specialExtDir=""; \
2358 for specialExt in $(MACROSSPECIALEXT); do \ 2359 for specialExt in $(MACROSSPECIALEXT); do \
2359 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 2360 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
2360 done; \ 2361 done; \
diff --git a/scilab/modules/scicos_blocks/Makefile.in b/scilab/modules/scicos_blocks/Makefile.in
index d6a4e1a..0e9a6ce6 100644
--- a/scilab/modules/scicos_blocks/Makefile.in
+++ b/scilab/modules/scicos_blocks/Makefile.in
@@ -4996,6 +4996,7 @@ install-data-local:
4996 if test -d $(srcdir)/$$dir/; then \ 4996 if test -d $(srcdir)/$$dir/; then \
4997 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 4997 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
4998 if test -n "$(MACROSSPECIALEXT)"; then \ 4998 if test -n "$(MACROSSPECIALEXT)"; then \
4999 specialExtDir=""; \
4999 for specialExt in $(MACROSSPECIALEXT); do \ 5000 for specialExt in $(MACROSSPECIALEXT); do \
5000 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 5001 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
5001 done; \ 5002 done; \
diff --git a/scilab/modules/shell/Makefile.in b/scilab/modules/shell/Makefile.in
index d63837d..40c9fc0 100644
--- a/scilab/modules/shell/Makefile.in
+++ b/scilab/modules/shell/Makefile.in
@@ -1250,6 +1250,7 @@ install-data-local:
1250 if test -d $(srcdir)/$$dir/; then \ 1250 if test -d $(srcdir)/$$dir/; then \
1251 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1251 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1252 if test -n "$(MACROSSPECIALEXT)"; then \ 1252 if test -n "$(MACROSSPECIALEXT)"; then \
1253 specialExtDir=""; \
1253 for specialExt in $(MACROSSPECIALEXT); do \ 1254 for specialExt in $(MACROSSPECIALEXT); do \
1254 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1255 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1255 done; \ 1256 done; \
diff --git a/scilab/modules/signal_processing/Makefile.in b/scilab/modules/signal_processing/Makefile.in
index 25b8156..6c8cb9c 100644
--- a/scilab/modules/signal_processing/Makefile.in
+++ b/scilab/modules/signal_processing/Makefile.in
@@ -1444,6 +1444,7 @@ install-data-local:
1444 if test -d $(srcdir)/$$dir/; then \ 1444 if test -d $(srcdir)/$$dir/; then \
1445 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1445 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1446 if test -n "$(MACROSSPECIALEXT)"; then \ 1446 if test -n "$(MACROSSPECIALEXT)"; then \
1447 specialExtDir=""; \
1447 for specialExt in $(MACROSSPECIALEXT); do \ 1448 for specialExt in $(MACROSSPECIALEXT); do \
1448 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1449 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1449 done; \ 1450 done; \
diff --git a/scilab/modules/simulated_annealing/Makefile.in b/scilab/modules/simulated_annealing/Makefile.in
index 1230caf..cb5979b 100644
--- a/scilab/modules/simulated_annealing/Makefile.in
+++ b/scilab/modules/simulated_annealing/Makefile.in
@@ -818,6 +818,7 @@ install-data-local:
818 if test -d $(srcdir)/$$dir/; then \ 818 if test -d $(srcdir)/$$dir/; then \
819 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 819 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
820 if test -n "$(MACROSSPECIALEXT)"; then \ 820 if test -n "$(MACROSSPECIALEXT)"; then \
821 specialExtDir=""; \
821 for specialExt in $(MACROSSPECIALEXT); do \ 822 for specialExt in $(MACROSSPECIALEXT); do \
822 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 823 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
823 done; \ 824 done; \
diff --git a/scilab/modules/sound/Makefile.in b/scilab/modules/sound/Makefile.in
index dc43cb9..c020b96 100644
--- a/scilab/modules/sound/Makefile.in
+++ b/scilab/modules/sound/Makefile.in
@@ -1032,6 +1032,7 @@ install-data-local:
1032 if test -d $(srcdir)/$$dir/; then \ 1032 if test -d $(srcdir)/$$dir/; then \
1033 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1033 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1034 if test -n "$(MACROSSPECIALEXT)"; then \ 1034 if test -n "$(MACROSSPECIALEXT)"; then \
1035 specialExtDir=""; \
1035 for specialExt in $(MACROSSPECIALEXT); do \ 1036 for specialExt in $(MACROSSPECIALEXT); do \
1036 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1037 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1037 done; \ 1038 done; \
diff --git a/scilab/modules/sparse/Makefile.in b/scilab/modules/sparse/Makefile.in
index a752751..59fd942 100644
--- a/scilab/modules/sparse/Makefile.in
+++ b/scilab/modules/sparse/Makefile.in
@@ -1827,6 +1827,7 @@ install-data-local:
1827 if test -d $(srcdir)/$$dir/; then \ 1827 if test -d $(srcdir)/$$dir/; then \
1828 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1828 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1829 if test -n "$(MACROSSPECIALEXT)"; then \ 1829 if test -n "$(MACROSSPECIALEXT)"; then \
1830 specialExtDir=""; \
1830 for specialExt in $(MACROSSPECIALEXT); do \ 1831 for specialExt in $(MACROSSPECIALEXT); do \
1831 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1832 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1832 done; \ 1833 done; \
diff --git a/scilab/modules/special_functions/Makefile.in b/scilab/modules/special_functions/Makefile.in
index 96a58c0..098a792 100644
--- a/scilab/modules/special_functions/Makefile.in
+++ b/scilab/modules/special_functions/Makefile.in
@@ -1229,6 +1229,7 @@ install-data-local:
1229 if test -d $(srcdir)/$$dir/; then \ 1229 if test -d $(srcdir)/$$dir/; then \
1230 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1230 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1231 if test -n "$(MACROSSPECIALEXT)"; then \ 1231 if test -n "$(MACROSSPECIALEXT)"; then \
1232 specialExtDir=""; \
1232 for specialExt in $(MACROSSPECIALEXT); do \ 1233 for specialExt in $(MACROSSPECIALEXT); do \
1233 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1234 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1234 done; \ 1235 done; \
diff --git a/scilab/modules/spreadsheet/Makefile.in b/scilab/modules/spreadsheet/Makefile.in
index 967b26f..dad4b41 100644
--- a/scilab/modules/spreadsheet/Makefile.in
+++ b/scilab/modules/spreadsheet/Makefile.in
@@ -1117,6 +1117,7 @@ install-data-local:
1117 if test -d $(srcdir)/$$dir/; then \ 1117 if test -d $(srcdir)/$$dir/; then \
1118 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1118 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1119 if test -n "$(MACROSSPECIALEXT)"; then \ 1119 if test -n "$(MACROSSPECIALEXT)"; then \
1120 specialExtDir=""; \
1120 for specialExt in $(MACROSSPECIALEXT); do \ 1121 for specialExt in $(MACROSSPECIALEXT); do \
1121 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1122 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1122 done; \ 1123 done; \
diff --git a/scilab/modules/statistics/Makefile.in b/scilab/modules/statistics/Makefile.in
index bfa5a7a..5516bdd 100644
--- a/scilab/modules/statistics/Makefile.in
+++ b/scilab/modules/statistics/Makefile.in
@@ -1420,6 +1420,7 @@ install-data-local:
1420 if test -d $(srcdir)/$$dir/; then \ 1420 if test -d $(srcdir)/$$dir/; then \
1421 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1421 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1422 if test -n "$(MACROSSPECIALEXT)"; then \ 1422 if test -n "$(MACROSSPECIALEXT)"; then \
1423 specialExtDir=""; \
1423 for specialExt in $(MACROSSPECIALEXT); do \ 1424 for specialExt in $(MACROSSPECIALEXT); do \
1424 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1425 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1425 done; \ 1426 done; \
diff --git a/scilab/modules/string/Makefile.in b/scilab/modules/string/Makefile.in
index 5b29256..9e25e54 100644
--- a/scilab/modules/string/Makefile.in
+++ b/scilab/modules/string/Makefile.in
@@ -1566,6 +1566,7 @@ install-data-local:
1566 if test -d $(srcdir)/$$dir/; then \ 1566 if test -d $(srcdir)/$$dir/; then \
1567 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1567 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1568 if test -n "$(MACROSSPECIALEXT)"; then \ 1568 if test -n "$(MACROSSPECIALEXT)"; then \
1569 specialExtDir=""; \
1569 for specialExt in $(MACROSSPECIALEXT); do \ 1570 for specialExt in $(MACROSSPECIALEXT); do \
1570 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1571 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1571 done; \ 1572 done; \
diff --git a/scilab/modules/symbolic/Makefile.in b/scilab/modules/symbolic/Makefile.in
index 9d47ad5..4bbe98c 100644
--- a/scilab/modules/symbolic/Makefile.in
+++ b/scilab/modules/symbolic/Makefile.in
@@ -1088,6 +1088,7 @@ install-data-local:
1088 if test -d $(srcdir)/$$dir/; then \ 1088 if test -d $(srcdir)/$$dir/; then \
1089 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1089 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1090 if test -n "$(MACROSSPECIALEXT)"; then \ 1090 if test -n "$(MACROSSPECIALEXT)"; then \
1091 specialExtDir=""; \
1091 for specialExt in $(MACROSSPECIALEXT); do \ 1092 for specialExt in $(MACROSSPECIALEXT); do \
1092 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1093 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1093 done; \ 1094 done; \
diff --git a/scilab/modules/tclsci/Makefile.in b/scilab/modules/tclsci/Makefile.in
index 2225ee1..8ad8d3d 100644
--- a/scilab/modules/tclsci/Makefile.in
+++ b/scilab/modules/tclsci/Makefile.in
@@ -1510,6 +1510,7 @@ install-data-local:
1510 if test -d $(srcdir)/$$dir/; then \ 1510 if test -d $(srcdir)/$$dir/; then \
1511 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1511 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1512 if test -n "$(MACROSSPECIALEXT)"; then \ 1512 if test -n "$(MACROSSPECIALEXT)"; then \
1513 specialExtDir=""; \
1513 for specialExt in $(MACROSSPECIALEXT); do \ 1514 for specialExt in $(MACROSSPECIALEXT); do \
1514 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1515 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1515 done; \ 1516 done; \
diff --git a/scilab/modules/texmacs/Makefile.in b/scilab/modules/texmacs/Makefile.in
index 74f2ee2..3b01202 100644
--- a/scilab/modules/texmacs/Makefile.in
+++ b/scilab/modules/texmacs/Makefile.in
@@ -814,6 +814,7 @@ install-data-local:
814 if test -d $(srcdir)/$$dir/; then \ 814 if test -d $(srcdir)/$$dir/; then \
815 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 815 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
816 if test -n "$(MACROSSPECIALEXT)"; then \ 816 if test -n "$(MACROSSPECIALEXT)"; then \
817 specialExtDir=""; \
817 for specialExt in $(MACROSSPECIALEXT); do \ 818 for specialExt in $(MACROSSPECIALEXT); do \
818 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 819 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
819 done; \ 820 done; \
diff --git a/scilab/modules/time/Makefile.in b/scilab/modules/time/Makefile.in
index 5d88d1a..2be5acd 100644
--- a/scilab/modules/time/Makefile.in
+++ b/scilab/modules/time/Makefile.in
@@ -1132,6 +1132,7 @@ install-data-local:
1132 if test -d $(srcdir)/$$dir/; then \ 1132 if test -d $(srcdir)/$$dir/; then \
1133 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1133 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1134 if test -n "$(MACROSSPECIALEXT)"; then \ 1134 if test -n "$(MACROSSPECIALEXT)"; then \
1135 specialExtDir=""; \
1135 for specialExt in $(MACROSSPECIALEXT); do \ 1136 for specialExt in $(MACROSSPECIALEXT); do \
1136 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1137 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1137 done; \ 1138 done; \
diff --git a/scilab/modules/umfpack/Makefile.in b/scilab/modules/umfpack/Makefile.in
index f6605d5..1aa530d 100644
--- a/scilab/modules/umfpack/Makefile.in
+++ b/scilab/modules/umfpack/Makefile.in
@@ -1211,6 +1211,7 @@ install-data-local:
1211 if test -d $(srcdir)/$$dir/; then \ 1211 if test -d $(srcdir)/$$dir/; then \
1212 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1212 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1213 if test -n "$(MACROSSPECIALEXT)"; then \ 1213 if test -n "$(MACROSSPECIALEXT)"; then \
1214 specialExtDir=""; \
1214 for specialExt in $(MACROSSPECIALEXT); do \ 1215 for specialExt in $(MACROSSPECIALEXT); do \
1215 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1216 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1216 done; \ 1217 done; \
diff --git a/scilab/modules/windows_tools/Makefile.in b/scilab/modules/windows_tools/Makefile.in
index 54783d0..9961ee4 100644
--- a/scilab/modules/windows_tools/Makefile.in
+++ b/scilab/modules/windows_tools/Makefile.in
@@ -1015,6 +1015,7 @@ install-data-local:
1015 if test -d $(srcdir)/$$dir/; then \ 1015 if test -d $(srcdir)/$$dir/; then \
1016 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1016 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1017 if test -n "$(MACROSSPECIALEXT)"; then \ 1017 if test -n "$(MACROSSPECIALEXT)"; then \
1018 specialExtDir=""; \
1018 for specialExt in $(MACROSSPECIALEXT); do \ 1019 for specialExt in $(MACROSSPECIALEXT); do \
1019 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1020 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1020 done; \ 1021 done; \
diff --git a/scilab/modules/xcos/Makefile.in b/scilab/modules/xcos/Makefile.in
index d903ab6..a567ce2 100644
--- a/scilab/modules/xcos/Makefile.in
+++ b/scilab/modules/xcos/Makefile.in
@@ -1540,6 +1540,7 @@ install-data-local:
1540 if test -d $(srcdir)/$$dir/; then \ 1540 if test -d $(srcdir)/$$dir/; then \
1541 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1541 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1542 if test -n "$(MACROSSPECIALEXT)"; then \ 1542 if test -n "$(MACROSSPECIALEXT)"; then \
1543 specialExtDir=""; \
1543 for specialExt in $(MACROSSPECIALEXT); do \ 1544 for specialExt in $(MACROSSPECIALEXT); do \
1544 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1545 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1545 done; \ 1546 done; \
diff --git a/scilab/modules/xpad/Makefile.in b/scilab/modules/xpad/Makefile.in
index 82d7fb9..c40a6c1 100644
--- a/scilab/modules/xpad/Makefile.in
+++ b/scilab/modules/xpad/Makefile.in
@@ -1177,6 +1177,7 @@ install-data-local:
1177 if test -d $(srcdir)/$$dir/; then \ 1177 if test -d $(srcdir)/$$dir/; then \
1178 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1178 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1179 if test -n "$(MACROSSPECIALEXT)"; then \ 1179 if test -n "$(MACROSSPECIALEXT)"; then \
1180 specialExtDir=""; \
1180 for specialExt in $(MACROSSPECIALEXT); do \ 1181 for specialExt in $(MACROSSPECIALEXT); do \
1181 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1182 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1182 done; \ 1183 done; \
diff --git a/scilab/modules/xpad/src/java/org/scilab/modules/xpad/XpadGUI.java b/scilab/modules/xpad/src/java/org/scilab/modules/xpad/XpadGUI.java
index 41ea4b1..1c1d5e6 100644
--- a/scilab/modules/xpad/src/java/org/scilab/modules/xpad/XpadGUI.java
+++ b/scilab/modules/xpad/src/java/org/scilab/modules/xpad/XpadGUI.java
@@ -423,7 +423,7 @@ public class XpadGUI {
423 } 423 }
424 } 424 }
425 }; 425 };
426 menuItem = new JMenuItem(Messages.gettext("Execute selection into Scilab")); 426 menuItem = new JMenuItem(XpadMessages.EVALUATE_SELECTION);
427 menuItem.addActionListener(actionListenerExecuteIntoScilab); 427 menuItem.addActionListener(actionListenerExecuteIntoScilab);
428 if (!ScilabConsole.isExistingConsole()) { /* Only available in STD mode */ 428 if (!ScilabConsole.isExistingConsole()) { /* Only available in STD mode */
429 menuItem.setEnabled(false); 429 menuItem.setEnabled(false);
diff --git a/scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/LoadIntoScilabAction.java b/scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/LoadIntoScilabAction.java
index dae3431..1f0e434 100644
--- a/scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/LoadIntoScilabAction.java
+++ b/scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/LoadIntoScilabAction.java
@@ -26,6 +26,9 @@ import javax.swing.KeyStroke;
26import org.scilab.modules.action_binding.InterpreterManagement; 26import org.scilab.modules.action_binding.InterpreterManagement;
27import org.scilab.modules.gui.menuitem.MenuItem; 27import org.scilab.modules.gui.menuitem.MenuItem;
28import org.scilab.modules.gui.messagebox.ScilabModalDialog; 28import org.scilab.modules.gui.messagebox.ScilabModalDialog;
29import org.scilab.modules.gui.messagebox.ScilabModalDialog.AnswerOption;
30import org.scilab.modules.gui.messagebox.ScilabModalDialog.ButtonType;
31import org.scilab.modules.gui.messagebox.ScilabModalDialog.IconType;
29import org.scilab.modules.xpad.Xpad; 32import org.scilab.modules.xpad.Xpad;
30import org.scilab.modules.xpad.utils.XpadMessages; 33import org.scilab.modules.xpad.utils.XpadMessages;
31 34
@@ -40,7 +43,6 @@ public final class LoadIntoScilabAction extends DefaultAction {
40 * serialVersionUID 43 * serialVersionUID
41 */ 44 */
42 private static final long serialVersionUID = -5659317486404897280L; 45 private static final long serialVersionUID = -5659317486404897280L;
43
44 46
45 /** 47 /**
46 * Constructor 48 * Constructor
@@ -55,32 +57,48 @@ public final class LoadIntoScilabAction extends DefaultAction {
55 */ 57 */
56 public void doAction() { 58 public void doAction() {
57 boolean bDoExec = false; 59 boolean bDoExec = false;
60
58 String text = getEditor().getTextPane().getText(); 61 String text = getEditor().getTextPane().getText();
59 62
60 if (text.compareTo("") != 0) { 63 if (text.compareTo("") != 0) {
61 String tmpFilename = "LOAD_INTO_SCILAB-" + UUID.randomUUID().toString() + ".sce"; 64 boolean bContinue = false;
62 String tmpFullFilename = System.getenv("TMPDIR") + System.getProperty("file.separator") + tmpFilename; 65
63 // save file as UTF-8 66 if (maxLinesRecommandedDetected(text)) {
64 File f = new File(tmpFullFilename); 67 if (ScilabModalDialog.show(Xpad.getEditor(), XpadMessages.BIG_FILE_WARNING, XpadMessages.LOAD_INTO_SCILAB,
65 try { 68 IconType.QUESTION_ICON, ButtonType.YES_NO) == AnswerOption.YES_OPTION) {
66 OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(f) , "UTF-8"); 69 bContinue = true;
67 out.write(text); 70 } else {
68 out.flush(); 71 bContinue = false;
69 out.close(); 72 }
70 bDoExec = true;
71 } catch (IOException e) {
72 bDoExec = false;
73 }
74
75 if (bDoExec && f.exists()) {
76 String cmdToExec = "exec('" + tmpFullFilename + "', 2)";
77 InterpreterManagement.requestScilabExec(cmdToExec);
78 } else { 73 } else {
79 ScilabModalDialog.show(getEditor(), XpadMessages.COULD_NOT_FIND_TMPFILE); 74 bContinue = true;
75 }
76
77 if (bContinue) {
78 String tmpFilename = "LOAD_INTO_SCILAB-" + UUID.randomUUID().toString() + ".sce";
79 String tmpFullFilename = System.getenv("TMPDIR") + System.getProperty("file.separator") + tmpFilename;
80 // save file as UTF-8
81 File f = new File(tmpFullFilename);
82 try {
83 OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(f) , "UTF-8");
84 out.write(text);
85 out.flush();
86 out.close();
87 bDoExec = true;
88 } catch (IOException e) {
89 bDoExec = false;
90 }
91
92 if (bDoExec && f.exists()) {
93 String cmdToExec = "exec('" + tmpFullFilename + "', 1)";
94 InterpreterManagement.requestScilabExec(cmdToExec);
95 } else {
96 ScilabModalDialog.show(getEditor(), XpadMessages.COULD_NOT_FIND_TMPFILE);
97 }
80 } 98 }
81 } 99 }
82 } 100 }
83 101
84 /** 102 /**
85 * createMenu 103 * createMenu
86 * @param editor Xpad 104 * @param editor Xpad
@@ -91,4 +109,25 @@ public final class LoadIntoScilabAction extends DefaultAction {
91 new LoadIntoScilabAction(editor), 109 new LoadIntoScilabAction(editor),
92 KeyStroke.getKeyStroke(KeyEvent.VK_L, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); 110 KeyStroke.getKeyStroke(KeyEvent.VK_L, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
93 } 111 }
112
113 /**
114 * check if string is not too big
115 * @param[in] text to scan
116 * @return true or false
117 */
118 private static boolean maxLinesRecommandedDetected(String text) {
119 int MAX_LINES_RECOMMANDED = 100;
120 int NB_STANDARD_COLUMNS = 80;
121 int MAX_CHARACTERS_RECOMMANDED = MAX_LINES_RECOMMANDED * NB_STANDARD_COLUMNS;
122 if (text.length() > MAX_CHARACTERS_RECOMMANDED) {
123 return true;
124 }
125
126 String splitedStringOnLineSeparator[] = text.split(System.getProperty("line.separator"));
127 if (splitedStringOnLineSeparator.length > MAX_LINES_RECOMMANDED) {
128 return true;
129 }
130
131 return false;
132 }
94} 133}
diff --git a/scilab/modules/xpad/src/java/org/scilab/modules/xpad/utils/XpadMessages.java b/scilab/modules/xpad/src/java/org/scilab/modules/xpad/utils/XpadMessages.java
index 60bf6ee..3763c21 100644
--- a/scilab/modules/xpad/src/java/org/scilab/modules/xpad/utils/XpadMessages.java
+++ b/scilab/modules/xpad/src/java/org/scilab/modules/xpad/utils/XpadMessages.java
@@ -139,7 +139,7 @@ public class XpadMessages {
139 public static final String NEXT_TAB = Messages.gettext("Next tab"); 139 public static final String NEXT_TAB = Messages.gettext("Next tab");
140 public static final String PREVIOUS_TAB = Messages.gettext("Previous tab"); 140 public static final String PREVIOUS_TAB = Messages.gettext("Previous tab");
141 public static final String EXECUTE_WARNING = Messages.gettext("You need to save your modifications before executing this file into Scilab."); 141 public static final String EXECUTE_WARNING = Messages.gettext("You need to save your modifications before executing this file into Scilab.");
142 142 public static final String BIG_FILE_WARNING = Messages.gettext("This file is very long. \"Execute File Into Scilab\" could be better.\nAre you sure to continue ?");
143 143
144 144
145 public static final String ENTER_LINE_NUMBER = Messages .gettext("Enter line number"); 145 public static final String ENTER_LINE_NUMBER = Messages .gettext("Enter line number");
@@ -148,8 +148,8 @@ public class XpadMessages {
148 /* Status bar messages */ 148 /* Status bar messages */
149 public static final String LOADING = Messages .gettext("Loading") + DOTS; 149 public static final String LOADING = Messages .gettext("Loading") + DOTS;
150 public static final String COLORIZATION_CANCELED = Messages .gettext("Colorization canceled"); 150 public static final String COLORIZATION_CANCELED = Messages .gettext("Colorization canceled");
151 151
152 152
153 /* About box */ 153 /* About box */
154 public static final String VERSION = Messages.gettext("Editor") + " 1.0"; 154 public static final String VERSION = Messages.gettext("Editor") + " 1.0";
155 public static final String DIGITEO = "The Scilab Consortium (DIGITEO)"; 155 public static final String DIGITEO = "The Scilab Consortium (DIGITEO)";
diff --git a/scilab/modules/xpad/tests/nonreg_tests/bug_5140.tst b/scilab/modules/xpad/tests/nonreg_tests/bug_5140.tst
index 0716d47..e4a3c5b 100644
--- a/scilab/modules/xpad/tests/nonreg_tests/bug_5140.tst
+++ b/scilab/modules/xpad/tests/nonreg_tests/bug_5140.tst
@@ -34,19 +34,23 @@ disp(A)
34 34
35//-->editor 35//-->editor
36 36
37-->1+1
37 ans = 38 ans =
38 39
39 2. 40 2.
40 41-->2
41 ans = 42 ans =
42 43
43 2. 44 2.
44 45-->A= 3
45 A = 46 A =
46 47
47 3. 48 3.
48 49-->disp(A)
49 50
50 3. 51 3.
51
52 52
53
54// creates a file with more 100 lines or more than 80 * 100 characters
55// do "Load into Scilab"
56// a message box should be opened , try 'yes' and 'no'