summaryrefslogtreecommitdiffstats
path: root/scilab/modules/intersci
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2009-09-21 11:06:41 +0200
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2009-09-21 11:06:41 +0200
commitaa7a641a3a7f0d783ecbdff8a1f00aa04bdc157f (patch)
tree736efa1f7d587baa50c49dca68b2daf44575d4a4 /scilab/modules/intersci
parent7d7c0393d6542ac05d78fd22d9e9b8b019469633 (diff)
downloadscilab-aa7a641a3a7f0d783ecbdff8a1f00aa04bdc157f.zip
scilab-aa7a641a3a7f0d783ecbdff8a1f00aa04bdc157f.tar.gz
* test ! -z => test -n (it is the same)
* add of a test which was causing problems with solaris. See: http://lists.scilab.org/cgi-bin/ezmlm-browse?list=dev&cmd=showmsg&msgnum=1559 * regeneration of all makefile
Diffstat (limited to 'scilab/modules/intersci')
-rw-r--r--scilab/modules/intersci/Makefile.in14
1 files changed, 8 insertions, 6 deletions
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index 24ca38d..c977055 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -1100,7 +1100,7 @@ check-code:
1100@SWIG_TRUE@swig: $(SWIG_WRAPPERS) 1100@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
1101@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \ 1101@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
1102@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \ 1102@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
1103@SWIG_TRUE@ if test ! -z "$(SWIG_WRAPPERS)"; then \ 1103@SWIG_TRUE@ if test -n "$(SWIG_WRAPPERS)"; then \
1104@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \ 1104@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \
1105@SWIG_TRUE@ echo "Swig process of $$file ..."; \ 1105@SWIG_TRUE@ echo "Swig process of $$file ..."; \
1106@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \ 1106@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \
@@ -1112,7 +1112,7 @@ check-code:
1112 1112
1113@GIWS_TRUE@giws: $(GIWS_WRAPPERS) 1113@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
1114@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\ 1114@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\
1115@GIWS_TRUE@ if test ! -z "$(GIWS_WRAPPERS)"; then \ 1115@GIWS_TRUE@ if test -n "$(GIWS_WRAPPERS)"; then \
1116@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \ 1116@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \
1117@GIWS_TRUE@ echo "GIWS process of $$file ..."; \ 1117@GIWS_TRUE@ echo "GIWS process of $$file ..."; \
1118@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \ 1118@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
@@ -1218,10 +1218,12 @@ install-data-local:
1218 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \ 1218 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
1219 if test -d $(srcdir)/$$dir/; then \ 1219 if test -d $(srcdir)/$$dir/; then \
1220 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1220 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1221 for specialExt in $(MACROSSPECIALEXT); do \ 1221 if test -n "$(MACROSSPECIALEXT)"; then \
1222 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1222 for specialExt in $(MACROSSPECIALEXT); do \
1223 done; \ 1223 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1224 FILELIST="$$FILELIST $$specialExtDir"; \ 1224 done; \
1225 FILELIST="$$FILELIST $$specialExtDir"; \
1226 fi; \
1225 for file in `ls -1 $$FILELIST 2>/dev/null`; do \ 1227 for file in `ls -1 $$FILELIST 2>/dev/null`; do \
1226 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \ 1228 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
1227 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \ 1229 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \