summaryrefslogtreecommitdiffstats
path: root/scilab/modules/intersci
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2009-04-21 08:25:00 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2009-04-21 08:25:00 +0200
commit0103aebd9ea3789bf881969d0db0d587a2dd2f8e (patch)
tree50ec8162678271df2323014d4a10bc2a027113cc /scilab/modules/intersci
parent90b4293c0a2245840717990dbe548fd00659c34a (diff)
parente245ec28340f62f3a382151c9435d83f1c36266b (diff)
downloadscilab-0103aebd9ea3789bf881969d0db0d587a2dd2f8e.zip
scilab-0103aebd9ea3789bf881969d0db0d587a2dd2f8e.tar.gz
Merge commit 'refs/remotes/origin/5.1'
Conflicts: scilab/Makefile.in scilab/configure scilab/contrib/Makefile.in scilab/libs/MALLOC/Makefile.in scilab/libs/Makefile.in scilab/libs/doublylinkedlist/Makefile.in scilab/libs/dynamiclibrary/Makefile.in scilab/libs/hashtable/Makefile.in scilab/libs/libst/Makefile.in scilab/modules/Makefile.in scilab/modules/action_binding/Makefile.in scilab/modules/arnoldi/Makefile.in scilab/modules/boolean/Makefile.in scilab/modules/cacsd/Makefile.in scilab/modules/call_scilab/Makefile.in scilab/modules/compatibility_functions/Makefile.in scilab/modules/compatibility_functions/tests/nonreg_tests/bug_649.tst scilab/modules/completion/Makefile.in scilab/modules/console/Makefile.in scilab/modules/core/Makefile.in scilab/modules/data_structures/Makefile.in scilab/modules/demo_tools/Makefile.in scilab/modules/development_tools/Makefile.in scilab/modules/development_tools/src/fake/Makefile.in scilab/modules/differential_equations/Makefile.in scilab/modules/double/Makefile.in scilab/modules/dynamic_link/Makefile.in scilab/modules/elementary_functions/Makefile.in scilab/modules/fftw/Makefile.in scilab/modules/fileio/Makefile.in scilab/modules/functions/Makefile.in scilab/modules/genetic_algorithms/Makefile.in scilab/modules/graphic_export/Makefile.in scilab/modules/graphics/Makefile.in scilab/modules/gui/Makefile.in scilab/modules/helptools/Makefile.in scilab/modules/history_manager/Makefile.in scilab/modules/integer/Makefile.in scilab/modules/interpolation/Makefile.in scilab/modules/intersci/Makefile.in scilab/modules/io/Makefile.in scilab/modules/javasci/Makefile.in scilab/modules/jvm/Makefile.in scilab/modules/linear_algebra/Makefile.in scilab/modules/localization/Makefile.in scilab/modules/m2sci/Makefile.in scilab/modules/maple2scilab/Makefile.in scilab/modules/matio/Makefile.in scilab/modules/metanet/Makefile.in scilab/modules/mexlib/Makefile.in scilab/modules/optimization/Makefile.in scilab/modules/output_stream/Makefile.in scilab/modules/overloading/Makefile.in scilab/modules/parameters/Makefile.in scilab/modules/polynomials/Makefile.in scilab/modules/pvm/Makefile.in scilab/modules/randlib/Makefile.in scilab/modules/renderer/Makefile.in scilab/modules/scicos/Makefile.in scilab/modules/scicos_blocks/Makefile.in scilab/modules/scilab2fortran/Makefile.in scilab/modules/scipad/Makefile.in scilab/modules/shell/Makefile.in scilab/modules/signal_processing/Makefile.in scilab/modules/simulated_annealing/Makefile.in scilab/modules/sound/Makefile.in scilab/modules/sparse/Makefile.in scilab/modules/special_functions/Makefile.in scilab/modules/spreadsheet/Makefile.in scilab/modules/statistics/Makefile.in scilab/modules/symbolic/Makefile.in scilab/modules/tclsci/Makefile.in scilab/modules/texmacs/Makefile.in scilab/modules/time/Makefile.in scilab/modules/umfpack/Makefile.in scilab/modules/windows_tools/Makefile.in
Diffstat (limited to 'scilab/modules/intersci')
-rw-r--r--scilab/modules/intersci/Makefile.in16
1 files changed, 15 insertions, 1 deletions
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index 004f004..accf62f 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -187,6 +187,7 @@ JAVA = @JAVA@
187JAVAC = @JAVAC@ 187JAVAC = @JAVAC@
188JAVAH = @JAVAH@ 188JAVAH = @JAVAH@
189JAVASCI_ENABLE = @JAVASCI_ENABLE@ 189JAVASCI_ENABLE = @JAVASCI_ENABLE@
190JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
190JAVA_ENABLE = @JAVA_ENABLE@ 191JAVA_ENABLE = @JAVA_ENABLE@
191JAVA_G = @JAVA_G@ 192JAVA_G = @JAVA_G@
192JAVA_HOME = @JAVA_HOME@ 193JAVA_HOME = @JAVA_HOME@
@@ -410,6 +411,9 @@ pkgdocdir = $(mydatadir)
410# What is the mask of the help source 411# What is the mask of the help source
411DOCMASKXML = *.xml 412DOCMASKXML = *.xml
412 413
414# What is the mask of the MathML sources
415DOCMASKMML = *.mml
416
413########### INSTALL DATA ################### 417########### INSTALL DATA ###################
414# Install macros, help & demos 418# Install macros, help & demos
415# Where it should be installed 419# Where it should be installed
@@ -1064,7 +1068,17 @@ install-html-local:
1064@INSTALL_HELP_XML_TRUE@ done ; \ 1068@INSTALL_HELP_XML_TRUE@ done ; \
1065@INSTALL_HELP_XML_TRUE@ fi; \ 1069@INSTALL_HELP_XML_TRUE@ fi; \
1066@INSTALL_HELP_XML_TRUE@ fi; \ 1070@INSTALL_HELP_XML_TRUE@ fi; \
1067@INSTALL_HELP_XML_TRUE@ done 1071@INSTALL_HELP_XML_TRUE@ done; \
1072@INSTALL_HELP_XML_TRUE@ @echo "-------- Install of MathML sources --------"; \
1073@INSTALL_HELP_XML_TRUE@ if test -d $(srcdir)/help/mml/; then \
1074@INSTALL_HELP_XML_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/help/mml/ && \
1075@INSTALL_HELP_XML_TRUE@ if ls -lLd $(srcdir)/help/mml/$(DOCMASKMML) >/dev/null 2>&1; then \
1076@INSTALL_HELP_XML_TRUE@ for file in $(srcdir)/help/mml/$(DOCMASKMML) ; do \
1077@INSTALL_HELP_XML_TRUE@ echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/help/mml" ; \
1078@INSTALL_HELP_XML_TRUE@ $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/help/mml ; \
1079@INSTALL_HELP_XML_TRUE@ done ; \
1080@INSTALL_HELP_XML_TRUE@ fi; \
1081@INSTALL_HELP_XML_TRUE@ fi
1068install-data-local: 1082install-data-local:
1069# Install the tests 1083# Install the tests
1070 @echo "-------- Install tests (if any) --------"; \ 1084 @echo "-------- Install tests (if any) --------"; \