summaryrefslogtreecommitdiffstats
path: root/scilab/modules/metanet
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/metanet
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/metanet')
-rw-r--r--scilab/modules/metanet/Makefile.in14
1 files changed, 8 insertions, 6 deletions
diff --git a/scilab/modules/metanet/Makefile.in b/scilab/modules/metanet/Makefile.in
index 2028e98..388f34c 100644
--- a/scilab/modules/metanet/Makefile.in
+++ b/scilab/modules/metanet/Makefile.in
@@ -1435,7 +1435,7 @@ check-code:
1435@SWIG_TRUE@swig: $(SWIG_WRAPPERS) 1435@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
1436@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \ 1436@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
1437@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \ 1437@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
1438@SWIG_TRUE@ if test ! -z "$(SWIG_WRAPPERS)"; then \ 1438@SWIG_TRUE@ if test -n "$(SWIG_WRAPPERS)"; then \
1439@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \ 1439@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \
1440@SWIG_TRUE@ echo "Swig process of $$file ..."; \ 1440@SWIG_TRUE@ echo "Swig process of $$file ..."; \
1441@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \ 1441@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \
@@ -1447,7 +1447,7 @@ check-code:
1447 1447
1448@GIWS_TRUE@giws: $(GIWS_WRAPPERS) 1448@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
1449@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\ 1449@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\
1450@GIWS_TRUE@ if test ! -z "$(GIWS_WRAPPERS)"; then \ 1450@GIWS_TRUE@ if test -n "$(GIWS_WRAPPERS)"; then \
1451@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \ 1451@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \
1452@GIWS_TRUE@ echo "GIWS process of $$file ..."; \ 1452@GIWS_TRUE@ echo "GIWS process of $$file ..."; \
1453@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \ 1453@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
@@ -1553,10 +1553,12 @@ install-data-local:
1553 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \ 1553 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
1554 if test -d $(srcdir)/$$dir/; then \ 1554 if test -d $(srcdir)/$$dir/; then \
1555 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1555 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1556 for specialExt in $(MACROSSPECIALEXT); do \ 1556 if test -n "$(MACROSSPECIALEXT)"; then \
1557 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1557 for specialExt in $(MACROSSPECIALEXT); do \
1558 done; \ 1558 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1559 FILELIST="$$FILELIST $$specialExtDir"; \ 1559 done; \
1560 FILELIST="$$FILELIST $$specialExtDir"; \
1561 fi; \
1560 for file in `ls -1 $$FILELIST 2>/dev/null`; do \ 1562 for file in `ls -1 $$FILELIST 2>/dev/null`; do \
1561 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \ 1563 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
1562 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \ 1564 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \