summaryrefslogtreecommitdiffstats
path: root/scilab/modules/dynamic_link
diff options
context:
space:
mode:
authorClément David <clement.david@esi-group.com>2021-07-15 15:50:48 +0200
committerClément David <clement.david@esi-group.com>2021-07-15 15:50:48 +0200
commit81a9cc049332de0c712cf56da585fcd25c8e59e3 (patch)
treef365c25a05c1782a16b2985bf7481116c106952d /scilab/modules/dynamic_link
parentb0937f19e4b8ddf416ca9a9a433bcbbd3f4ef2c0 (diff)
parent90b4ecb9b57ac6ad4e00d4a99b0d8bd1a6424403 (diff)
downloadscilab-master.zip
scilab-master.tar.gz
Merge remote-tracking branch 'origin/6.1'HEADmaster
Change-Id: I5d26fc380a28efe0bb6d0096fe9684b274b55bfe
Diffstat (limited to 'scilab/modules/dynamic_link')
-rw-r--r--scilab/modules/dynamic_link/Makefile.in2
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_gen_Make_unix.sci1
2 files changed, 3 insertions, 0 deletions
diff --git a/scilab/modules/dynamic_link/Makefile.in b/scilab/modules/dynamic_link/Makefile.in
index f9cc2f2..a7c5fde 100644
--- a/scilab/modules/dynamic_link/Makefile.in
+++ b/scilab/modules/dynamic_link/Makefile.in
@@ -464,9 +464,11 @@ NMEDIT = @NMEDIT@
464OBJDUMP = @OBJDUMP@ 464OBJDUMP = @OBJDUMP@
465OBJEXT = @OBJEXT@ 465OBJEXT = @OBJEXT@
466OCAMLC = @OCAMLC@ 466OCAMLC = @OCAMLC@
467OCAMLCFLAGS = @OCAMLCFLAGS@
467OCAMLDEP = @OCAMLDEP@ 468OCAMLDEP = @OCAMLDEP@
468OCAMLLEX = @OCAMLLEX@ 469OCAMLLEX = @OCAMLLEX@
469OCAMLOPT = @OCAMLOPT@ 470OCAMLOPT = @OCAMLOPT@
471OCAMLOPTFLAGS = @OCAMLOPTFLAGS@
470OCAMLYACC = @OCAMLYACC@ 472OCAMLYACC = @OCAMLYACC@
471OPENMPI_CC = @OPENMPI_CC@ 473OPENMPI_CC = @OPENMPI_CC@
472OPENMPI_CFLAGS = @OPENMPI_CFLAGS@ 474OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
diff --git a/scilab/modules/dynamic_link/macros/ilib_gen_Make_unix.sci b/scilab/modules/dynamic_link/macros/ilib_gen_Make_unix.sci
index ace6158..0a3d714 100644
--- a/scilab/modules/dynamic_link/macros/ilib_gen_Make_unix.sci
+++ b/scilab/modules/dynamic_link/macros/ilib_gen_Make_unix.sci
@@ -269,6 +269,7 @@ function copyMandatoryFiles(commandpath,workingPath)
269 mandatoryFiles = ["compilerDetection.sh", .. 269 mandatoryFiles = ["compilerDetection.sh", ..
270 "configure.ac", .. 270 "configure.ac", ..
271 "configure", .. 271 "configure", ..
272 "compile", ..
272 "Makefile.am", .. 273 "Makefile.am", ..
273 "Makefile.in", .. 274 "Makefile.in", ..
274 "config.sub", .. 275 "config.sub", ..