summaryrefslogtreecommitdiffstats
path: root/scilab/modules/compatibility_functions
diff options
context:
space:
mode:
authorBruno JOFRET <bruno.jofret@scilab.org>2009-09-22 12:02:58 +0200
committerBruno JOFRET <bruno.jofret@scilab.org>2009-09-22 12:02:58 +0200
commitf23b2110d698093a959634e19007c8d84d531c5e (patch)
tree9d2f52524635264289e90dcfaa4fa0c44eb147d2 /scilab/modules/compatibility_functions
parent6e0ed76a324ba57a846cf16750c297414d32428d (diff)
parent11ad7608e335c7505a00ee05fd2a3d67a5e6842e (diff)
downloadscilab-f23b2110d698093a959634e19007c8d84d531c5e.zip
scilab-f23b2110d698093a959634e19007c8d84d531c5e.tar.gz
Merge commit 'origin/master' into Xcos
Conflicts: scilab/configure
Diffstat (limited to 'scilab/modules/compatibility_functions')
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in14
1 files changed, 8 insertions, 6 deletions
diff --git a/scilab/modules/compatibility_functions/Makefile.in b/scilab/modules/compatibility_functions/Makefile.in
index 58c3349..3dacb33 100644
--- a/scilab/modules/compatibility_functions/Makefile.in
+++ b/scilab/modules/compatibility_functions/Makefile.in
@@ -686,7 +686,7 @@ check-code:
686@SWIG_TRUE@swig: $(SWIG_WRAPPERS) 686@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
687@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \ 687@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
688@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \ 688@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
689@SWIG_TRUE@ if test ! -z "$(SWIG_WRAPPERS)"; then \ 689@SWIG_TRUE@ if test -n "$(SWIG_WRAPPERS)"; then \
690@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \ 690@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \
691@SWIG_TRUE@ echo "Swig process of $$file ..."; \ 691@SWIG_TRUE@ echo "Swig process of $$file ..."; \
692@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \ 692@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \
@@ -698,7 +698,7 @@ check-code:
698 698
699@GIWS_TRUE@giws: $(GIWS_WRAPPERS) 699@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
700@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\ 700@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\
701@GIWS_TRUE@ if test ! -z "$(GIWS_WRAPPERS)"; then \ 701@GIWS_TRUE@ if test -n "$(GIWS_WRAPPERS)"; then \
702@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \ 702@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \
703@GIWS_TRUE@ echo "GIWS process of $$file ..."; \ 703@GIWS_TRUE@ echo "GIWS process of $$file ..."; \
704@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \ 704@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
@@ -804,10 +804,12 @@ install-data-local:
804 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \ 804 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
805 if test -d $(srcdir)/$$dir/; then \ 805 if test -d $(srcdir)/$$dir/; then \
806 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 806 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
807 for specialExt in $(MACROSSPECIALEXT); do \ 807 if test -n "$(MACROSSPECIALEXT)"; then \
808 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 808 for specialExt in $(MACROSSPECIALEXT); do \
809 done; \ 809 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
810 FILELIST="$$FILELIST $$specialExtDir"; \ 810 done; \
811 FILELIST="$$FILELIST $$specialExtDir"; \
812 fi; \
811 for file in `ls -1 $$FILELIST 2>/dev/null`; do \ 813 for file in `ls -1 $$FILELIST 2>/dev/null`; do \
812 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \ 814 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
813 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \ 815 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \