Make install had problem with Macros / some makefile updated (a few files have been...

diff --git a/scilab/Makefile.am b/scilab/Makefile.am
index f7f1bf5..4c3a673 100644 (file)
--- a/scilab/Makefile.am
+++ b/scilab/Makefile.am
@@ -20,7 +20,7 @@ bin_SCRIPTS                   = bin/scilab
 
 scilab_bin_SOURCES             = $(top_srcdir)/modules/core/src/fortran/mainsci.f
 
-scilab_bin_LDADD = $(top_builddir)/modules/libsciscilab.la \
+scilab_bin_LDADD = $(top_builddir)/modules/libscilab.la \
        $(X_EXTRA_LIBS) -lXt -lX11 -lSM
 
 sysconf_DATA = $(top_srcdir)/etc/scilab.start \

diff --git a/scilab/Makefile.in b/scilab/Makefile.in
index dd5676d..8447a77 100644 (file)
--- a/scilab/Makefile.in
+++ b/scilab/Makefile.in
@@ -71,7 +71,7 @@ PROGRAMS = $(bin_PROGRAMS)
 am_scilab_bin_OBJECTS = mainsci.$(OBJEXT)
 scilab_bin_OBJECTS = $(am_scilab_bin_OBJECTS)
 am__DEPENDENCIES_1 =
-scilab_bin_DEPENDENCIES = $(top_builddir)/modules/libsciscilab.la \
+scilab_bin_DEPENDENCIES = $(top_builddir)/modules/libscilab.la \
        $(am__DEPENDENCIES_1)
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(bin_SCRIPTS)
@@ -263,7 +263,7 @@ ACLOCAL_AMFLAGS = -I m4/
 changelogs = CHANGES
 bin_SCRIPTS = bin/scilab
 scilab_bin_SOURCES = $(top_srcdir)/modules/core/src/fortran/mainsci.f
-scilab_bin_LDADD = $(top_builddir)/modules/libsciscilab.la \
+scilab_bin_LDADD = $(top_builddir)/modules/libscilab.la \
        $(X_EXTRA_LIBS) -lXt -lX11 -lSM
 
 sysconf_DATA = $(top_srcdir)/etc/scilab.start \

diff --git a/scilab/Makefile.incl.am b/scilab/Makefile.incl.am
index d9171ef..ed70ba7 100644 (file)
--- a/scilab/Makefile.incl.am
+++ b/scilab/Makefile.incl.am
@@ -67,12 +67,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/libs/MALLOC/Makefile.in b/scilab/libs/MALLOC/Makefile.in
index 0156243..ea372ff 100644 (file)
--- a/scilab/libs/MALLOC/Makefile.in
+++ b/scilab/libs/MALLOC/Makefile.in
@@ -627,12 +627,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/libs/blas/Makefile.in b/scilab/libs/blas/Makefile.in
index 7c7383b..4172497 100644 (file)
--- a/scilab/libs/blas/Makefile.in
+++ b/scilab/libs/blas/Makefile.in
@@ -639,12 +639,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/libs/hashtable/Makefile.in b/scilab/libs/hashtable/Makefile.in
index bee2eae..acb2596 100644 (file)
--- a/scilab/libs/hashtable/Makefile.in
+++ b/scilab/libs/hashtable/Makefile.in
@@ -616,12 +616,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/libs/lapack/Makefile.in b/scilab/libs/lapack/Makefile.in
index 7324bd6..2045b95 100644 (file)
--- a/scilab/libs/lapack/Makefile.in
+++ b/scilab/libs/lapack/Makefile.in
@@ -925,12 +925,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index c6cbd6f..8f3b9c8 100644 (file)
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -65,19 +65,16 @@ SUBDIRS += .
 
 
 
-#### Target ######
-target=$(datadir)
-
 #### Basic files ####
-libsciscilab_la_rootdir = $(target)
-libsciscilab_la_root_DATA = modules
+libscilab_la_rootdir = $(datadir)
+libscilab_la_root_DATA = modules
 
 # 
-pkglib_LTLIBRARIES = libsciscilab.la
-libsciscilab_la_SOURCES = 
+pkglib_LTLIBRARIES = libscilab.la
+libscilab_la_SOURCES = 
 
 # Core modules
-libsciscilab_la_LIBADD = \
+libscilab_la_LIBADD = \
        $(top_builddir)/modules/mexlib/libscimexlib.la \
        $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
        $(top_builddir)/modules/boolean/libsciboolean.la \
@@ -110,17 +107,17 @@ libsciscilab_la_LIBADD = \
        $(top_builddir)/modules/wintools/libsciwintools.la
 
 if PVM
-libsciscilab_la_LIBADD += $(top_builddir)/modules/pvm/libsciscipvm.la
+libscilab_la_LIBADD += $(top_builddir)/modules/pvm/libsciscipvm.la
 endif
 
 if JAVA
-libsciscilab_la_LIBADD += $(top_builddir)/modules/jvm/libsciscijvm.la
+libscilab_la_LIBADD += $(top_builddir)/modules/jvm/libsciscijvm.la
 endif
 
-libsciscilab_la_LIBADD += $(top_builddir)/modules/scicos/libsciscicos.la
+libscilab_la_LIBADD += $(top_builddir)/modules/scicos/libsciscicos.la
 
 ## Libs 
-libsciscilab_la_LIBADD += \
+libscilab_la_LIBADD += \
 $(top_builddir)/libs/blas/libsciblas.la \
 $(top_builddir)/libs/hashtable/libscihashtable.la \
 $(top_builddir)/libs/lapack/libscilapack.la \
@@ -131,3 +128,5 @@ BUILT_SOURCES = modules
 # Generate the module list from the SUBDIRS
 modules:
        @for module in $(SUBDIRS); do if test $$module != "."; then echo $$module; fi;  done > modules
+
+include $(top_srcdir)/Makefile.incl.am

diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index 5c79e50..cc0e9aa 100644 (file)
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -19,6 +19,14 @@
 ### INRIA - Scilab 2006 
 ##########
 
+##########
+### Sylvestre Ledru <sylvestre.ledru@inria.fr>
+### INRIA - Scilab 2006 - 2007
+### 
+### Makefile included stuff
+### Target, variable, suffixes which are supposed to be usefull in every makefile.am
+##########
+
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -44,8 +52,9 @@ host_triplet = @host@
 @PVM_TRUE@am__append_2 = pvm
 @PVM_TRUE@am__append_3 = $(top_builddir)/modules/pvm/libsciscipvm.la
 @JAVA_TRUE@am__append_4 = $(top_builddir)/modules/jvm/libsciscijvm.la
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+       $(top_srcdir)/Makefile.incl.am
 subdir = modules
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fortran.m4 \
        $(top_srcdir)/m4/java.m4 $(top_srcdir)/m4/libs_by_debian.m4 \
@@ -66,10 +75,10 @@ am__vpath_adj = case $$p in \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(pkglibdir)" \
-       "$(DESTDIR)$(libsciscilab_la_rootdir)"
+       "$(DESTDIR)$(libscilab_la_rootdir)"
 pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
-libsciscilab_la_DEPENDENCIES =  \
+libscilab_la_DEPENDENCIES =  \
        $(top_builddir)/modules/mexlib/libscimexlib.la \
        $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
        $(top_builddir)/modules/boolean/libsciboolean.la \
@@ -106,8 +115,8 @@ libsciscilab_la_DEPENDENCIES =  \
        $(top_builddir)/libs/hashtable/libscihashtable.la \
        $(top_builddir)/libs/lapack/libscilapack.la \
        $(top_builddir)/libs/MALLOC/libscimalloc.la
-am_libsciscilab_la_OBJECTS =
-libsciscilab_la_OBJECTS = $(am_libsciscilab_la_OBJECTS)
+am_libscilab_la_OBJECTS =
+libscilab_la_OBJECTS = $(am_libscilab_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(top_builddir)/modules/core/includes@am__isrc@
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -118,8 +127,8 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
-SOURCES = $(libsciscilab_la_SOURCES)
-DIST_SOURCES = $(libsciscilab_la_SOURCES)
+SOURCES = $(libscilab_la_SOURCES)
+DIST_SOURCES = $(libscilab_la_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
        html-recursive info-recursive install-data-recursive \
        install-dvi-recursive install-exec-recursive \
@@ -127,8 +136,8 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
        install-pdf-recursive install-ps-recursive install-recursive \
        installcheck-recursive installdirs-recursive pdf-recursive \
        ps-recursive uninstall-recursive
-libsciscilab_la_rootDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(libsciscilab_la_root_DATA)
+libscilab_la_rootDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(libscilab_la_root_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -247,7 +256,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
-datadir = @datadir@
+
+# Where all the Scilab stuff is installed (macros, help, ...)
+datadir = ${prefix}/modules
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
@@ -293,20 +304,16 @@ SUBDIRS = intersci polynomials cacsd elementaries_functions arnoldi \
        tfds scipad scilab2fortran development_tools helptools scicos \
        $(am__append_1) $(am__append_2) .
 
-#### Target ######
-target = $(datadir)
-
 #### Basic files ####
-libsciscilab_la_rootdir = $(target)
-libsciscilab_la_root_DATA = modules
+libscilab_la_rootdir = $(datadir)
+libscilab_la_root_DATA = modules
 
 # 
-pkglib_LTLIBRARIES = libsciscilab.la
-libsciscilab_la_SOURCES = 
+pkglib_LTLIBRARIES = libscilab.la
+libscilab_la_SOURCES = 
 
 # Core modules
-libsciscilab_la_LIBADD =  \
-       $(top_builddir)/modules/mexlib/libscimexlib.la \
+libscilab_la_LIBADD = $(top_builddir)/modules/mexlib/libscimexlib.la \
        $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
        $(top_builddir)/modules/boolean/libsciboolean.la \
        $(top_builddir)/modules/cacsd/libscicacsd.la \
@@ -343,11 +350,31 @@ libsciscilab_la_LIBADD =  \
        $(top_builddir)/libs/lapack/libscilapack.la \
        $(top_builddir)/libs/MALLOC/libscimalloc.la
 BUILT_SOURCES = modules
+
+# Where headers (*.h) are installed (usually /usr/include/scilab/)
+sciincludedir = ${includedir}/scilab
+
+#SUFFIXES = .xml .sci .htm
+SUFFIXES = .sci
+
+# Install HTML files into the right target
+# We do not use the automake mechanism (libxxxx_la_help_fr_DATA) because
+# automake needs the html files to be present which is not the case when
+# we are building Scilab
+pkgdocdir = $(target)
+DOCDIRS = help/fr help/eng
+DOCMASK = *.htm
+
+#bhalbhalbha
+pkgmacrosdir = $(target)
+MACROSDIRS = macros/
+MACROSMASK = *.sci
 all: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+.SUFFIXES: .sci .bin
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.incl.am $(am__configure_deps)
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
            *$$dep*) \
@@ -403,8 +430,8 @@ clean-pkglibLTLIBRARIES:
          echo "rm -f \"$${dir}/so_locations\""; \
          rm -f "$${dir}/so_locations"; \
        done
-libsciscilab.la: $(libsciscilab_la_OBJECTS) $(libsciscilab_la_DEPENDENCIES) 
-       $(LINK) -rpath $(pkglibdir) $(libsciscilab_la_OBJECTS) $(libsciscilab_la_LIBADD) $(LIBS)
+libscilab.la: $(libscilab_la_OBJECTS) $(libscilab_la_DEPENDENCIES) 
+       $(LINK) -rpath $(pkglibdir) $(libscilab_la_OBJECTS) $(libscilab_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
@@ -417,22 +444,22 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-install-libsciscilab_la_rootDATA: $(libsciscilab_la_root_DATA)
+install-libscilab_la_rootDATA: $(libscilab_la_root_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(libsciscilab_la_rootdir)" || $(MKDIR_P) "$(DESTDIR)$(libsciscilab_la_rootdir)"
-       @list='$(libsciscilab_la_root_DATA)'; for p in $$list; do \
+       test -z "$(libscilab_la_rootdir)" || $(MKDIR_P) "$(DESTDIR)$(libscilab_la_rootdir)"
+       @list='$(libscilab_la_root_DATA)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          f=$(am__strip_dir) \
-         echo " $(libsciscilab_la_rootDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libsciscilab_la_rootdir)/$$f'"; \
-         $(libsciscilab_la_rootDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libsciscilab_la_rootdir)/$$f"; \
+         echo " $(libscilab_la_rootDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libscilab_la_rootdir)/$$f'"; \
+         $(libscilab_la_rootDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libscilab_la_rootdir)/$$f"; \
        done
 
-uninstall-libsciscilab_la_rootDATA:
+uninstall-libscilab_la_rootDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(libsciscilab_la_root_DATA)'; for p in $$list; do \
+       @list='$(libscilab_la_root_DATA)'; for p in $$list; do \
          f=$(am__strip_dir) \
-         echo " rm -f '$(DESTDIR)$(libsciscilab_la_rootdir)/$$f'"; \
-         rm -f "$(DESTDIR)$(libsciscilab_la_rootdir)/$$f"; \
+         echo " rm -f '$(DESTDIR)$(libscilab_la_rootdir)/$$f'"; \
+         rm -f "$(DESTDIR)$(libscilab_la_rootdir)/$$f"; \
        done
 
 # This directory's subdirectories are mostly independent; you can cd
@@ -615,7 +642,7 @@ check: $(BUILT_SOURCES)
 all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-       for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libsciscilab_la_rootdir)"; do \
+       for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libscilab_la_rootdir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: $(BUILT_SOURCES)
@@ -664,7 +691,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-libsciscilab_la_rootDATA
+install-data-am: install-data-local install-libscilab_la_rootDATA
 
 install-dvi: install-dvi-recursive
 
@@ -672,6 +699,8 @@ install-exec-am: install-pkglibLTLIBRARIES
 
 install-html: install-html-recursive
 
+install-html-am: install-html-local
+
 install-info: install-info-recursive
 
 install-man:
@@ -699,7 +728,7 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-libsciscilab_la_rootDATA \
+uninstall-am: uninstall-libscilab_la_rootDATA \
        uninstall-pkglibLTLIBRARIES
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
@@ -710,22 +739,74 @@ uninstall-am: uninstall-libsciscilab_la_rootDATA \
        clean-pkglibLTLIBRARIES ctags ctags-recursive distclean \
        distclean-compile distclean-generic distclean-libtool \
        distclean-tags distdir dvi dvi-am html html-am info info-am \
-       install install-am install-data install-data-am install-dvi \
-       install-dvi-am install-exec install-exec-am install-html \
-       install-html-am install-info install-info-am \
-       install-libsciscilab_la_rootDATA install-man install-pdf \
+       install install-am install-data install-data-am \
+       install-data-local install-dvi install-dvi-am install-exec \
+       install-exec-am install-html install-html-am \
+       install-html-local install-info install-info-am \
+       install-libscilab_la_rootDATA install-man install-pdf \
        install-pdf-am install-pkglibLTLIBRARIES install-ps \
        install-ps-am install-strip installcheck installcheck-am \
        installdirs installdirs-am maintainer-clean \
        maintainer-clean-generic mostlyclean mostlyclean-compile \
        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
        tags tags-recursive uninstall uninstall-am \
-       uninstall-libsciscilab_la_rootDATA uninstall-pkglibLTLIBRARIES
+       uninstall-libscilab_la_rootDATA uninstall-pkglibLTLIBRARIES
 
 
 # Generate the module list from the SUBDIRS
 modules:
        @for module in $(SUBDIRS); do if test $$module != "."; then echo $$module; fi;  done > modules
+
+# Rule to build a macro
+.sci.bin:
+       -@( if test ! -x $(top_builddir)/scilab-bin; then \
+       echo "Error : Cannot build $< : Scilab has not been build"; \
+       else \
+       echo "Creating $@"; \
+       $(top_builddir)/bin/scilab -ns -nwni -e "getf('$(abs_srcdir)/$<');save('$(abs_srcdir)/$@');exit;"; \
+       fi )
+
+macrossly:
+       @( if test ! -x $(top_builddir)/scilab-bin; then \
+       echo "Error : Cannot build $< : Scilab has not been build"; \
+       else \
+       LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
+       SCI=`cd $(top_builddir); pwd;`; export SCI; \
+       echo $$SCI/modules/functions/macros/genlib.bin; \
+       if test ! -f $$SCI/modules/functions/macros/genlib.bin; then \
+       (cd $$SCI; $$SCI/scilab-bin -ns -nwni -f $$SCI/modules/functions/scripts/buildmacros/buildmacros.sce;) \
+       fi; \
+       echo $(top_builddir)/scilab-bin -ns -nwni -f macros/buildmacros.sce; \
+       $(top_builddir)/scilab-bin -nwni -f macros/buildmacros.sce; \
+       fi )
+install-html-local:
+       $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
+       @for dir in $(DOCDIRS) ; do \
+         $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$$dir && \
+               if ls -lLd $(srcdir)/$$dir/$(DOCMASK) >/dev/null 2>&1; then \
+                 for file in $(srcdir)/$$dir/$(DOCMASK) ; do \
+                   echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/$$dir" ; \
+               $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/$$dir ; \
+                 done ; \
+               fi; \
+       done
+install-data-local: $(MACROS)
+       $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)
+       @if test ! -z "$(MACROS)"; then \
+       for dir in $(MACROSDIRS) ; do \
+         $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
+                   echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
+               $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
+                 done ; \
+       done; \
+       fi
+
+macros:$(top_builddir)/scilab-bin $(top_builddir)/bin/scilab $(MACROS)
+       -@( \
+       LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
+       $(top_builddir)/bin/scilab -nb -nwni -f $(abs_srcdir)/macros/buildmacros.sce    )
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/scilab/modules/arnoldi/Makefile.am b/scilab/modules/arnoldi/Makefile.am
index cec4f65..5661aec 100644 (file)
--- a/scilab/modules/arnoldi/Makefile.am
+++ b/scilab/modules/arnoldi/Makefile.am
@@ -98,7 +98,7 @@ libsciarnoldi_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### arnoldi : Scilab macros ###
 libsciarnoldi_la_macrodir = $(target)/macros
-libsciarnoldi_la_macro_DATA22 =  macros/buildmacros.sce
+MACROS =  macros/buildmacros.sce
 
 
 #### arnoldi : init scripts #### 

diff --git a/scilab/modules/arnoldi/Makefile.in b/scilab/modules/arnoldi/Makefile.in
index 407d848..3e4d003 100644 (file)
--- a/scilab/modules/arnoldi/Makefile.in
+++ b/scilab/modules/arnoldi/Makefile.in
@@ -371,7 +371,7 @@ libsciarnoldi_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### arnoldi : Scilab macros ###
 libsciarnoldi_la_macrodir = $(target)/macros
-libsciarnoldi_la_macro_DATA22 = macros/buildmacros.sce
+MACROS = macros/buildmacros.sce
 
 #### arnoldi : init scripts #### 
 libsciarnoldi_la_etcdir = $(target)/etc
@@ -1019,12 +1019,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/boolean/Makefile.am b/scilab/modules/boolean/Makefile.am
index 23afc38..cf8d70d 100644 (file)
--- a/scilab/modules/boolean/Makefile.am
+++ b/scilab/modules/boolean/Makefile.am
@@ -45,7 +45,7 @@ libsciboolean_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### boolean : Scilab macros ###
 libsciboolean_la_macrodir = $(target)/macros
-libsciboolean_la_macro_DATA22 =  macros/buildmacros.sce
+MACROS =  macros/buildmacros.sce
 
 
 #### boolean : init scripts #### 

diff --git a/scilab/modules/boolean/Makefile.in b/scilab/modules/boolean/Makefile.in
index f4791ac..8432dd8 100644 (file)
--- a/scilab/modules/boolean/Makefile.in
+++ b/scilab/modules/boolean/Makefile.in
@@ -298,7 +298,7 @@ libsciboolean_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### boolean : Scilab macros ###
 libsciboolean_la_macrodir = $(target)/macros
-libsciboolean_la_macro_DATA22 = macros/buildmacros.sce
+MACROS = macros/buildmacros.sce
 
 #### boolean : init scripts #### 
 libsciboolean_la_etcdir = $(target)/etc
@@ -801,12 +801,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/cacsd/Makefile.am b/scilab/modules/cacsd/Makefile.am
index 54d95e3..9e4d72c 100644 (file)
--- a/scilab/modules/cacsd/Makefile.am
+++ b/scilab/modules/cacsd/Makefile.am
@@ -244,7 +244,7 @@ libscicacsd_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### cacsd : Scilab macros ###
 libscicacsd_la_macrodir = $(target)/macros
-libscicacsd_la_macro_DATA22 = macros/krac2.sci \
+MACROS = macros/krac2.sci \
 macros/sysdiag.sci \
 macros/linfn.sci \
 macros/sm2ss.sci \

diff --git a/scilab/modules/cacsd/Makefile.in b/scilab/modules/cacsd/Makefile.in
index b7a3c57..2911a07 100644 (file)
--- a/scilab/modules/cacsd/Makefile.in
+++ b/scilab/modules/cacsd/Makefile.in
@@ -588,7 +588,7 @@ libscicacsd_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### cacsd : Scilab macros ###
 libscicacsd_la_macrodir = $(target)/macros
-libscicacsd_la_macro_DATA22 = macros/krac2.sci \
+MACROS = macros/krac2.sci \
 macros/sysdiag.sci \
 macros/linfn.sci \
 macros/sm2ss.sci \
@@ -2063,12 +2063,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/core/Makefile.am b/scilab/modules/core/Makefile.am
index 98e11ec..0ca1390 100644 (file)
--- a/scilab/modules/core/Makefile.am
+++ b/scilab/modules/core/Makefile.am
@@ -344,7 +344,7 @@ libscicore_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### core : Scilab macros ###
 libscicore_la_macrodir = $(target)/macros
-libscicore_la_macro_DATA22 = macros/perl.sci \
+MACROS = macros/perl.sci \
 macros/typeof.sci \
 macros/getshell.sci \
 macros/with_tk.sci \

diff --git a/scilab/modules/core/Makefile.in b/scilab/modules/core/Makefile.in
index aa5ec5b..ac15b76 100644 (file)
--- a/scilab/modules/core/Makefile.in
+++ b/scilab/modules/core/Makefile.in
@@ -718,7 +718,7 @@ libscicore_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### core : Scilab macros ###
 libscicore_la_macrodir = $(target)/macros
-libscicore_la_macro_DATA22 = macros/perl.sci \
+MACROS = macros/perl.sci \
 macros/typeof.sci \
 macros/getshell.sci \
 macros/with_tk.sci \
@@ -2809,12 +2809,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/data_structures/Makefile.am b/scilab/modules/data_structures/Makefile.am
index cc097c6..0478203 100644 (file)
--- a/scilab/modules/data_structures/Makefile.am
+++ b/scilab/modules/data_structures/Makefile.am
@@ -70,7 +70,7 @@ libscidata_structures_la_root_DATA = changelog.txt licence.txt readme.txt VERSIO
 
 #### data_structures : Scilab macros ###
 libscidata_structures_la_macrodir = $(target)/macros
-libscidata_structures_la_macro_DATA22 = macros/struct.sci \
+libscidata_structures_la_macro_MACROS = macros/struct.sci \
 macros/iscell.sci \
 macros/cell.sci \
 macros/isfield.sci \

diff --git a/scilab/modules/data_structures/Makefile.in b/scilab/modules/data_structures/Makefile.in
index 529b02e..659db41 100644 (file)
--- a/scilab/modules/data_structures/Makefile.in
+++ b/scilab/modules/data_structures/Makefile.in
@@ -336,7 +336,7 @@ libscidata_structures_la_root_DATA = changelog.txt licence.txt readme.txt VERSIO
 
 #### data_structures : Scilab macros ###
 libscidata_structures_la_macrodir = $(target)/macros
-libscidata_structures_la_macro_DATA22 = macros/struct.sci \
+libscidata_structures_la_macro_MACROS = macros/struct.sci \
 macros/iscell.sci \
 macros/cell.sci \
 macros/isfield.sci \
@@ -959,12 +959,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/development_tools/Makefile.am b/scilab/modules/development_tools/Makefile.am
index 6d75f23..d015c32 100644 (file)
--- a/scilab/modules/development_tools/Makefile.am
+++ b/scilab/modules/development_tools/Makefile.am
@@ -16,7 +16,7 @@ libdevelopment_tools_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### development_tools : Scilab macros ###
 libdevelopment_tools_la_macrodir = $(target)/macros
-libdevelopment_tools_la_macro_DATA22 = macros/scitest.sci \
+libdevelopment_tools_la_macro_MACROS = macros/scitest.sci \
 macros/testexamples.sci macros/scitest.bin \
 macros/testexamples.bin macros/names macros/lib macros/buildmacros.sce
 

diff --git a/scilab/modules/development_tools/Makefile.in b/scilab/modules/development_tools/Makefile.in
index f40dd96..c3c0665 100644 (file)
--- a/scilab/modules/development_tools/Makefile.in
+++ b/scilab/modules/development_tools/Makefile.in
@@ -226,7 +226,7 @@ libdevelopment_tools_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### development_tools : Scilab macros ###
 libdevelopment_tools_la_macrodir = $(target)/macros
-libdevelopment_tools_la_macro_DATA22 = macros/scitest.sci \
+libdevelopment_tools_la_macro_MACROS = macros/scitest.sci \
 macros/testexamples.sci macros/scitest.bin \
 macros/testexamples.bin macros/names macros/lib macros/buildmacros.sce
 
@@ -506,12 +506,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/differential_equations/Makefile.am b/scilab/modules/differential_equations/Makefile.am
index 5fc506c..e2b2f88 100644 (file)
--- a/scilab/modules/differential_equations/Makefile.am
+++ b/scilab/modules/differential_equations/Makefile.am
@@ -1,3 +1,8 @@
+##########
+### Sylvestre Ledru <sylvestre.ledru@inria.fr>
+### INRIA - Scilab 2006 
+##########
+
 DIFFERENTIAL_EQUATIONS_C_SOURCES = src/c/dassl.c
 
 DIFFERENTIAL_EQUATIONS_FORTRAN_SOURCES = src/fortran/rscar1.f \
@@ -130,7 +135,7 @@ libscidifferential_equations_la_root_DATA = changelog.txt licence.txt readme.txt
 
 #### differential_equations : Scilab macros ###
 libscidifferential_equations_la_macrodir = $(target)/macros
-libscidifferential_equations_la_macro_DATA22 = macros/odeoptions.sci macros/odeoptions.bin macros/names macros/lib macros/buildmacros.sce
+libscidifferential_equations_la_macro_MACROS = macros/odeoptions.sci macros/odeoptions.bin macros/names macros/lib macros/buildmacros.sce
 
 
 #### differential_equations : init scripts #### 

diff --git a/scilab/modules/differential_equations/Makefile.in b/scilab/modules/differential_equations/Makefile.in
index 42e61bf..d9bcaee 100644 (file)
--- a/scilab/modules/differential_equations/Makefile.in
+++ b/scilab/modules/differential_equations/Makefile.in
@@ -16,6 +16,11 @@
 
 ##########
 ### Sylvestre Ledru <sylvestre.ledru@inria.fr>
+### INRIA - Scilab 2006 
+##########
+
+##########
+### Sylvestre Ledru <sylvestre.ledru@inria.fr>
 ### INRIA - Scilab 2006 - 2007
 ### 
 ### Makefile included stuff
@@ -400,7 +405,7 @@ libscidifferential_equations_la_root_DATA = changelog.txt licence.txt readme.txt
 
 #### differential_equations : Scilab macros ###
 libscidifferential_equations_la_macrodir = $(target)/macros
-libscidifferential_equations_la_macro_DATA22 = macros/odeoptions.sci macros/odeoptions.bin macros/names macros/lib macros/buildmacros.sce
+libscidifferential_equations_la_macro_MACROS = macros/odeoptions.sci macros/odeoptions.bin macros/names macros/lib macros/buildmacros.sce
 
 #### differential_equations : init scripts #### 
 libscidifferential_equations_la_etcdir = $(target)/etc
@@ -1188,12 +1193,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/double/Makefile.am b/scilab/modules/double/Makefile.am
index 5a8fb7a..5129731 100644 (file)
--- a/scilab/modules/double/Makefile.am
+++ b/scilab/modules/double/Makefile.am
@@ -48,7 +48,7 @@ libscidouble_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### double : Scilab macros ###
 libscidouble_la_macrodir = $(target)/macros
-libscidouble_la_macro_DATA22 = macros/buildmacros.sce
+MACROS = macros/buildmacros.sce
 
 
 #### double : init scripts #### 

diff --git a/scilab/modules/double/Makefile.in b/scilab/modules/double/Makefile.in
index 648e2f4..ca22d59 100644 (file)
--- a/scilab/modules/double/Makefile.in
+++ b/scilab/modules/double/Makefile.in
@@ -290,7 +290,7 @@ libscidouble_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### double : Scilab macros ###
 libscidouble_la_macrodir = $(target)/macros
-libscidouble_la_macro_DATA22 = macros/buildmacros.sce
+MACROS = macros/buildmacros.sce
 
 #### double : init scripts #### 
 libscidouble_la_etcdir = $(target)/etc
@@ -752,12 +752,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/elementaries_functions/Makefile.am b/scilab/modules/elementaries_functions/Makefile.am
index 3683abd..aae0e3d 100644 (file)
--- a/scilab/modules/elementaries_functions/Makefile.am
+++ b/scilab/modules/elementaries_functions/Makefile.am
@@ -588,11 +588,5 @@ libscielementaries_functions_la_include_HEADERS = includes/sci_tools.h \
 includes/gw_elementaries_functions.h \
 includes/elementaries_functions.h
 
-#macrosplop: $(MACROS)
-#      echo "macrosplop"
-
-#install-data-local: macrosplop
-#      echo "rohh"
-
 include $(top_srcdir)/Makefile.incl.am
 

diff --git a/scilab/modules/elementaries_functions/Makefile.in b/scilab/modules/elementaries_functions/Makefile.in
index e6e8e9a..4147637 100644 (file)
--- a/scilab/modules/elementaries_functions/Makefile.in
+++ b/scilab/modules/elementaries_functions/Makefile.in
@@ -2888,12 +2888,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 
@@ -2901,12 +2900,6 @@ macros:$(top_builddir)/scilab-bin $(top_builddir)/bin/scilab $(MACROS)
        -@( \
        LD_LIBRARY_PATH="$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/server/:$(JAVA_HOME)/jre/lib/i386/native_threads/:$LD_LIBRARY_PATH";      export LD_LIBRARY_PATH; \
        $(top_builddir)/bin/scilab -nb -nwni -f $(abs_srcdir)/macros/buildmacros.sce    )
-
-#macrosplop: $(MACROS)
-#      echo "macrosplop"
-
-#install-data-local: macrosplop
-#      echo "rohh"
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/scilab/modules/fftw/Makefile.am b/scilab/modules/fftw/Makefile.am
index 26ee063..20ae314 100644 (file)
--- a/scilab/modules/fftw/Makefile.am
+++ b/scilab/modules/fftw/Makefile.am
@@ -11,7 +11,7 @@ libscifftw_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### fftw : Scilab macros ###
 libscifftw_la_macrodir = $(target)/macros
-libscifftw_la_macro_DATA22 =   macros/names macros/lib macros/buildmacros.sce
+MACROS =   macros/names macros/lib macros/buildmacros.sce
 
 
 #### fftw : init scripts #### 

diff --git a/scilab/modules/fileio/Makefile.am b/scilab/modules/fileio/Makefile.am
index dbdcae6..85c4f2d 100644 (file)
--- a/scilab/modules/fileio/Makefile.am
+++ b/scilab/modules/fileio/Makefile.am
@@ -60,7 +60,7 @@ libscifileio_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### fileio : Scilab macros ###
 libscifileio_la_macrodir = $(target)/macros
-libscifileio_la_macro_DATA22 = macros/fullfile.sci \
+MACROS = macros/fullfile.sci \
 macros/readxls.sci \
 macros/mkdir.sci \
 macros/isdir.sci \

diff --git a/scilab/modules/fileio/Makefile.in b/scilab/modules/fileio/Makefile.in
index 3b15abf..73f30b8 100644 (file)
--- a/scilab/modules/fileio/Makefile.in
+++ b/scilab/modules/fileio/Makefile.in
@@ -315,7 +315,7 @@ libscifileio_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### fileio : Scilab macros ###
 libscifileio_la_macrodir = $(target)/macros
-libscifileio_la_macro_DATA22 = macros/fullfile.sci \
+MACROS = macros/fullfile.sci \
 macros/readxls.sci \
 macros/mkdir.sci \
 macros/isdir.sci \
@@ -1059,12 +1059,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/functions/Makefile.am b/scilab/modules/functions/Makefile.am
index 284c292..bf36a3a 100644 (file)
--- a/scilab/modules/functions/Makefile.am
+++ b/scilab/modules/functions/Makefile.am
@@ -15,7 +15,7 @@ libscifunctions_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### functions : Scilab macros ###
 libscifunctions_la_macrodir = $(target)/macros
-libscifunctions_la_macro_DATA22 = macros/getd.sci \
+MACROS = macros/getd.sci \
 macros/head_comments.sci \
 macros/macrovar.sci \
 macros/old2newinstr.sci \

diff --git a/scilab/modules/functions/Makefile.in b/scilab/modules/functions/Makefile.in
index 90e1569..2ee076b 100644 (file)
--- a/scilab/modules/functions/Makefile.in
+++ b/scilab/modules/functions/Makefile.in
@@ -225,7 +225,7 @@ libscifunctions_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### functions : Scilab macros ###
 libscifunctions_la_macrodir = $(target)/macros
-libscifunctions_la_macro_DATA22 = macros/getd.sci \
+MACROS = macros/getd.sci \
 macros/head_comments.sci \
 macros/macrovar.sci \
 macros/old2newinstr.sci \
@@ -523,12 +523,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/graphics/Makefile.am b/scilab/modules/graphics/Makefile.am
index 8684f22..bcb3a6a 100644 (file)
--- a/scilab/modules/graphics/Makefile.am
+++ b/scilab/modules/graphics/Makefile.am
@@ -449,7 +449,7 @@ libscigraphics_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### graphics : Scilab macros ###
 libscigraphics_la_macrodir = $(target)/macros
-libscigraphics_la_macro_DATA22 = macros/replot.sci \
+MACROS = macros/replot.sci \
 macros/getlinestyle.sci \
 macros/zlabel.sci \
 macros/checkXYPair.sci \

diff --git a/scilab/modules/graphics/Makefile.in b/scilab/modules/graphics/Makefile.in
index 4de0390..c19755e 100644 (file)
--- a/scilab/modules/graphics/Makefile.in
+++ b/scilab/modules/graphics/Makefile.in
@@ -1064,7 +1064,7 @@ libscigraphics_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### graphics : Scilab macros ###
 libscigraphics_la_macrodir = $(target)/macros
-libscigraphics_la_macro_DATA22 = macros/replot.sci \
+MACROS = macros/replot.sci \
 macros/getlinestyle.sci \
 macros/zlabel.sci \
 macros/checkXYPair.sci \
@@ -5283,12 +5283,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/gui/Makefile.am b/scilab/modules/gui/Makefile.am
index 2221dcd..df93a67 100644 (file)
--- a/scilab/modules/gui/Makefile.am
+++ b/scilab/modules/gui/Makefile.am
@@ -129,7 +129,7 @@ libscigui_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### gui : Scilab macros ###
 libscigui_la_macrodir = $(target)/macros
-libscigui_la_macro_DATA22 = macros/unsetmenu.sci \
+MACROS = macros/unsetmenu.sci \
 macros/x_choices.sci \
 macros/savedefaultbrowser.sci \
 macros/delmenu.sci \

diff --git a/scilab/modules/gui/Makefile.in b/scilab/modules/gui/Makefile.in
index 3d72053..b8d3617 100644 (file)
--- a/scilab/modules/gui/Makefile.in
+++ b/scilab/modules/gui/Makefile.in
@@ -454,7 +454,7 @@ libscigui_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### gui : Scilab macros ###
 libscigui_la_macrodir = $(target)/macros
-libscigui_la_macro_DATA22 = macros/unsetmenu.sci \
+MACROS = macros/unsetmenu.sci \
 macros/x_choices.sci \
 macros/savedefaultbrowser.sci \
 macros/delmenu.sci \
@@ -1500,12 +1500,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/helptools/Makefile.am b/scilab/modules/helptools/Makefile.am
index cec0898..3cda538 100644 (file)
--- a/scilab/modules/helptools/Makefile.am
+++ b/scilab/modules/helptools/Makefile.am
@@ -7,9 +7,6 @@
 #### Target ######
 target=$(datadir)/helptools
 
-#SUFFIXES = .bin
-#      SCISCRIPT=$<
-#      $(top_builddir)/scilab-bin -ns -nwni -e "getf('$SCISCRIPT'); save('$SCISCRIPT.bin'); exit;"
 
 #### helptools : Conf files ####
 libscihelptools_la_rootdir = $(target)
@@ -17,7 +14,7 @@ libscihelptools_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### helptools : Scilab macros ###
 libscihelptools_la_macrodir = $(target)/macros
-dist_libscihelptools_la_macro_DATA22 = macros/add_help_chapter.sci \
+MACROS = macros/add_help_chapter.sci \
 macros/browsehelp.sci \
 macros/help_menu.sci \
 macros/make_help_index.sci \
@@ -36,7 +33,6 @@ macros/loaddefaultbrowser.sci \
 macros/xmlfiletohtml.sci \
 macros/xmltohtml.sci \
 macros/clean_help.sci \
-macros/initial_help_chapters.sci \
 macros/help_skeleton.sci \
 macros/change_help_language.sci macros/add_help_chapter.bin \
 macros/apropos.bin \
@@ -54,7 +50,6 @@ macros/gethelpfile.bin \
 macros/help_menu.bin \
 macros/help.bin \
 macros/help_skeleton.bin \
-macros/initial_help_chapters.bin \
 macros/loaddefaultbrowser.bin \
 macros/make_help_index.bin \
 macros/manedit.bin \

diff --git a/scilab/modules/helptools/Makefile.in b/scilab/modules/helptools/Makefile.in
index df69686..b01adb7 100644 (file)
--- a/scilab/modules/helptools/Makefile.in
+++ b/scilab/modules/helptools/Makefile.in
@@ -219,17 +219,13 @@ top_srcdir = @top_srcdir@
 #### Target ######
 target = $(datadir)/helptools
 
-#SUFFIXES = .bin
-#      SCISCRIPT=$<
-#      $(top_builddir)/scilab-bin -ns -nwni -e "getf('$SCISCRIPT'); save('$SCISCRIPT.bin'); exit;"
-
 #### helptools : Conf files ####
 libscihelptools_la_rootdir = $(target)
 libscihelptools_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### helptools : Scilab macros ###
 libscihelptools_la_macrodir = $(target)/macros
-dist_libscihelptools_la_macro_DATA22 = macros/add_help_chapter.sci \
+MACROS = macros/add_help_chapter.sci \
 macros/browsehelp.sci \
 macros/help_menu.sci \
 macros/make_help_index.sci \
@@ -248,7 +244,6 @@ macros/loaddefaultbrowser.sci \
 macros/xmlfiletohtml.sci \
 macros/xmltohtml.sci \
 macros/clean_help.sci \
-macros/initial_help_chapters.sci \
 macros/help_skeleton.sci \
 macros/change_help_language.sci macros/add_help_chapter.bin \
 macros/apropos.bin \
@@ -266,7 +261,6 @@ macros/gethelpfile.bin \
 macros/help_menu.bin \
 macros/help.bin \
 macros/help_skeleton.bin \
-macros/initial_help_chapters.bin \
 macros/loaddefaultbrowser.bin \
 macros/make_help_index.bin \
 macros/manedit.bin \
@@ -547,12 +541,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/incremental_link/Makefile.am b/scilab/modules/incremental_link/Makefile.am
index eb85a58..f8ba570 100644 (file)
--- a/scilab/modules/incremental_link/Makefile.am
+++ b/scilab/modules/incremental_link/Makefile.am
@@ -15,7 +15,7 @@ libincremental_link_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### incremental_link : Scilab macros ###
 libincremental_link_la_macrodir = $(target)/macros
-libincremental_link_la_macro_DATA22 = macros/ilib_for_link.sci \
+libincremental_link_la_macro_MACROS = macros/ilib_for_link.sci \
 macros/G_make.sci \
 macros/VCtoLCCLib.sci \
 macros/findmsvccompiler.sci \

diff --git a/scilab/modules/incremental_link/Makefile.in b/scilab/modules/incremental_link/Makefile.in
index 07e357b..f39800c 100644 (file)
--- a/scilab/modules/incremental_link/Makefile.in
+++ b/scilab/modules/incremental_link/Makefile.in
@@ -233,7 +233,7 @@ libincremental_link_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### incremental_link : Scilab macros ###
 libincremental_link_la_macrodir = $(target)/macros
-libincremental_link_la_macro_DATA22 = macros/ilib_for_link.sci \
+libincremental_link_la_macro_MACROS = macros/ilib_for_link.sci \
 macros/G_make.sci \
 macros/VCtoLCCLib.sci \
 macros/findmsvccompiler.sci \
@@ -599,12 +599,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/incremental_link/src/scripts/configure.ac b/scilab/modules/incremental_link/src/scripts/configure.ac
index fdef477..756675d 100644 (file)
--- a/scilab/modules/incremental_link/src/scripts/configure.ac
+++ b/scilab/modules/incremental_link/src/scripts/configure.ac
@@ -1,20 +1,39 @@
+##########
+### Sylvestre Ledru <sylvestre.ledru@inria.fr>
+### INRIA - Scilab 2006/2007
+##########
+### Configure.ac is used to create the configure file which will be 
+### used by the incremental link to detect compilers, flags, linker...
+### Should be multiplateform
+##########
+
+# Initialise autoconf
 AC_INIT([scilab],[0],[http://scilabsoft.inria.fr/cgi-bin/bugzilla_bug_II/index.cgi])
-AM_INIT_AUTOMAKE([foreign])
-AM_MAINTAINER_MODE
 
+# Initialise automake (foreign is low strictness)
+AM_INIT_AUTOMAKE([foreign]) 
+
+# Detect C compiler
 AC_PROG_CC
+
+# Detect C++ compiler
 AC_PROG_CXX
+
+# Detect Fortran Compiler (77 and 90)
 AC_PROG_F77
 
+# Initialise libtool
 AC_PROG_LIBTOOL
+
+# Specify which Makefile.in should be "adapted"
 AC_CONFIG_FILES([Makefile])
+
+# Configure the Makefile
 AC_OUTPUT
 
 
 echo ""
 echo "Options used to compile and link:"
-echo "  PREFIX           = $PREFIX_DIR"
-echo "  EXEC-PREFIX      = $EXEC_PREFIX_DIR"
 echo "  CC               = $CC"
 echo "  CFLAGS           = $CFLAGS"
 echo "  CPP              = $CPP"

diff --git a/scilab/modules/integer/Makefile.am b/scilab/modules/integer/Makefile.am
index 0ad704f..4a12ee8 100644 (file)
--- a/scilab/modules/integer/Makefile.am
+++ b/scilab/modules/integer/Makefile.am
@@ -141,7 +141,7 @@ libsciinteger_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### integer : Scilab macros ###
 libsciinteger_la_macrodir = $(target)/macros
-libsciinteger_la_macro_DATA22 = macros/%i_plot2d1.sci \
+MACROS = macros/%i_plot2d1.sci \
 macros/%i_mfprintf.sci \
 macros/%i_plot2d2.sci \
 macros/%i_contour.sci \

diff --git a/scilab/modules/integer/Makefile.in b/scilab/modules/integer/Makefile.in
index bfc7444..39d5048 100644 (file)
--- a/scilab/modules/integer/Makefile.in
+++ b/scilab/modules/integer/Makefile.in
@@ -423,7 +423,7 @@ libsciinteger_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### integer : Scilab macros ###
 libsciinteger_la_macrodir = $(target)/macros
-libsciinteger_la_macro_DATA22 = macros/%i_plot2d1.sci \
+MACROS = macros/%i_plot2d1.sci \
 macros/%i_mfprintf.sci \
 macros/%i_plot2d2.sci \
 macros/%i_contour.sci \
@@ -1522,12 +1522,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/interpolation/Makefile.am b/scilab/modules/interpolation/Makefile.am
index 3f0a18c..b540f53 100644 (file)
--- a/scilab/modules/interpolation/Makefile.am
+++ b/scilab/modules/interpolation/Makefile.am
@@ -50,7 +50,7 @@ libsciinterpolation_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### interpolation : Scilab macros ###
 libsciinterpolation_la_macrodir = $(target)/macros
-libsciinterpolation_la_macro_DATA22 = macros/buildmacros.sce
+MACROS = macros/buildmacros.sce
 
 
 #### interpolation : init scripts #### 

diff --git a/scilab/modules/interpolation/Makefile.in b/scilab/modules/interpolation/Makefile.in
index 97e8a5e..9a7a5ca 100644 (file)
--- a/scilab/modules/interpolation/Makefile.in
+++ b/scilab/modules/interpolation/Makefile.in
@@ -321,7 +321,7 @@ libsciinterpolation_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### interpolation : Scilab macros ###
 libsciinterpolation_la_macrodir = $(target)/macros
-libsciinterpolation_la_macro_DATA22 = macros/buildmacros.sce
+MACROS = macros/buildmacros.sce
 
 #### interpolation : init scripts #### 
 libsciinterpolation_la_etcdir = $(target)/etc
@@ -921,12 +921,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/intersci/Makefile.am b/scilab/modules/intersci/Makefile.am
index 46f5efc..1e41964 100644 (file)
--- a/scilab/modules/intersci/Makefile.am
+++ b/scilab/modules/intersci/Makefile.am
@@ -51,7 +51,7 @@ libsciintersci_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### intersci : Scilab macros ###
 libsciintersci_la_macrodir = $(target)/macros
-libsciintersci_la_macro_DATA22 =   macros/buildmacros.sce
+MACROS =   macros/buildmacros.sce
 
 
 #### intersci : init scripts #### 

diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index 7c4d35a..24b4980 100644 (file)
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -290,7 +290,7 @@ libsciintersci_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### intersci : Scilab macros ###
 libsciintersci_la_macrodir = $(target)/macros
-libsciintersci_la_macro_DATA22 = macros/buildmacros.sce
+MACROS = macros/buildmacros.sce
 
 #### intersci : init scripts #### 
 libsciintersci_la_etcdir = $(target)/etc
@@ -896,12 +896,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/io/Makefile.am b/scilab/modules/io/Makefile.am
index f179c83..fa231b2 100644 (file)
--- a/scilab/modules/io/Makefile.am
+++ b/scilab/modules/io/Makefile.am
@@ -102,7 +102,7 @@ libsciio_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### io : Scilab macros ###
 libsciio_la_macrodir = $(target)/macros
-libsciio_la_macro_DATA22 = macros/printf.sci \
+MACROS = macros/printf.sci \
 macros/ssprint.sci \
 macros/getscilabkeywords.sci \
 macros/sprintf.sci \

diff --git a/scilab/modules/io/Makefile.in b/scilab/modules/io/Makefile.in
index 5152f61..9b3f4ac 100644 (file)
--- a/scilab/modules/io/Makefile.in
+++ b/scilab/modules/io/Makefile.in
@@ -373,7 +373,7 @@ libsciio_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### io : Scilab macros ###
 libsciio_la_macrodir = $(target)/macros
-libsciio_la_macro_DATA22 = macros/printf.sci \
+MACROS = macros/printf.sci \
 macros/ssprint.sci \
 macros/getscilabkeywords.sci \
 macros/sprintf.sci \
@@ -1226,12 +1226,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/javasci/Makefile.am b/scilab/modules/javasci/Makefile.am
index 8ce36ae..4dc40b7 100644 (file)
--- a/scilab/modules/javasci/Makefile.am
+++ b/scilab/modules/javasci/Makefile.am
@@ -14,7 +14,7 @@ libscijavasci_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### javasci : Scilab macros ###
 libscijavasci_la_macrodir = $(target)/macros
-libscijavasci_la_macro_DATA22 =  macros/buildmacros.sce
+MACROS =  macros/buildmacros.sce
 
 
 #### javasci : init scripts #### 

diff --git a/scilab/modules/javasci/Makefile.in b/scilab/modules/javasci/Makefile.in
index 66c6d44..f811eb2 100644 (file)
--- a/scilab/modules/javasci/Makefile.in
+++ b/scilab/modules/javasci/Makefile.in
@@ -232,7 +232,7 @@ libscijavasci_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### javasci : Scilab macros ###
 libscijavasci_la_macrodir = $(target)/macros
-libscijavasci_la_macro_DATA22 = macros/buildmacros.sce
+MACROS = macros/buildmacros.sce
 
 #### javasci : init scripts #### 
 libscijavasci_la_etcdir = $(target)/etc
@@ -582,12 +582,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/jvm/Makefile.am b/scilab/modules/jvm/Makefile.am
index 071cbd7..6adb02b 100644 (file)
--- a/scilab/modules/jvm/Makefile.am
+++ b/scilab/modules/jvm/Makefile.am
@@ -34,7 +34,7 @@ libscijvm_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### jvm : Scilab macros ###
 libscijvm_la_macrodir = $(target)/macros
-libscijvm_la_macro_DATA22 =  macros/buildmacros.sce
+MACROS =  macros/buildmacros.sce
 
 
 #### jvm : init scripts #### 

diff --git a/scilab/modules/jvm/Makefile.in b/scilab/modules/jvm/Makefile.in
index 857a4e9..5cbb111 100644 (file)
--- a/scilab/modules/jvm/Makefile.in
+++ b/scilab/modules/jvm/Makefile.in
@@ -267,7 +267,7 @@ top_srcdir = @top_srcdir@
 
 #### jvm : Scilab macros ###
 @JAVA_TRUE@libscijvm_la_macrodir = $(target)/macros
-@JAVA_TRUE@libscijvm_la_macro_DATA22 = macros/buildmacros.sce
+@JAVA_TRUE@MACROS = macros/buildmacros.sce
 
 #### jvm : init scripts #### 
 @JAVA_TRUE@libscijvm_la_etcdir = $(target)/etc
@@ -675,12 +675,11 @@ uninstall-am: uninstall-libscijvm_la_etcDATA \
 @JAVA_TRUE@    @if test ! -z "$(MACROS)"; then \
 @JAVA_TRUE@    for dir in $(MACROSDIRS) ; do \
 @JAVA_TRUE@      $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-@JAVA_TRUE@            if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-@JAVA_TRUE@              for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+@JAVA_TRUE@                    echo "file in "$(srcdir)/$$dir; \
+@JAVA_TRUE@              for file in $(MACROS); do \
 @JAVA_TRUE@                echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
 @JAVA_TRUE@            $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
 @JAVA_TRUE@              done ; \
-@JAVA_TRUE@            fi; \
 @JAVA_TRUE@    done; \
 @JAVA_TRUE@    fi
 

diff --git a/scilab/modules/linear_algebra/Makefile.am b/scilab/modules/linear_algebra/Makefile.am
index d3d3570..bfa3be3 100644 (file)
--- a/scilab/modules/linear_algebra/Makefile.am
+++ b/scilab/modules/linear_algebra/Makefile.am
@@ -107,7 +107,7 @@ libscilinear_algebra_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### linear_algebra : Scilab macros ###
 libscilinear_algebra_la_macrodir = $(target)/macros
-libscilinear_algebra_la_macro_DATA22 = macros/spaninter.sci \
+libscilinear_algebra_la_macro_MACROS = macros/spaninter.sci \
 macros/WritemiMatrix.sci \
 macros/penlaur.sci \
 macros/ndims.sci \

diff --git a/scilab/modules/linear_algebra/Makefile.in b/scilab/modules/linear_algebra/Makefile.in
index f62f3b0..b1b6d1b 100644 (file)
--- a/scilab/modules/linear_algebra/Makefile.in
+++ b/scilab/modules/linear_algebra/Makefile.in
@@ -386,7 +386,7 @@ libscilinear_algebra_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### linear_algebra : Scilab macros ###
 libscilinear_algebra_la_macrodir = $(target)/macros
-libscilinear_algebra_la_macro_DATA22 = macros/spaninter.sci \
+libscilinear_algebra_la_macro_MACROS = macros/spaninter.sci \
 macros/WritemiMatrix.sci \
 macros/penlaur.sci \
 macros/ndims.sci \
@@ -1249,12 +1249,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/localization/Makefile.am b/scilab/modules/localization/Makefile.am
index 0243523..74f4604 100644 (file)
--- a/scilab/modules/localization/Makefile.am
+++ b/scilab/modules/localization/Makefile.am
@@ -31,7 +31,7 @@ libscilocalization_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### localization : Scilab macros ###
 libscilocalization_la_macrodir = $(target)/macros
-libscilocalization_la_macro_DATA22 = macros/setlanguage.sci macros/setlanguage.bin macros/names macros/lib macros/buildmacros.sce
+MACROS = macros/setlanguage.sci macros/setlanguage.bin macros/names macros/lib macros/buildmacros.sce
 
 
 #### localization : init scripts #### 

diff --git a/scilab/modules/localization/Makefile.in b/scilab/modules/localization/Makefile.in
index 1c8cd11..36b867b 100644 (file)
--- a/scilab/modules/localization/Makefile.in
+++ b/scilab/modules/localization/Makefile.in
@@ -270,7 +270,7 @@ libscilocalization_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### localization : Scilab macros ###
 libscilocalization_la_macrodir = $(target)/macros
-libscilocalization_la_macro_DATA22 = macros/setlanguage.sci macros/setlanguage.bin macros/names macros/lib macros/buildmacros.sce
+MACROS = macros/setlanguage.sci macros/setlanguage.bin macros/names macros/lib macros/buildmacros.sce
 
 #### localization : init scripts #### 
 libscilocalization_la_etcdir = $(target)/etc
@@ -696,12 +696,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/m2sci/Makefile.am b/scilab/modules/m2sci/Makefile.am
index a0932da..1d94b9d 100644 (file)
--- a/scilab/modules/m2sci/Makefile.am
+++ b/scilab/modules/m2sci/Makefile.am
@@ -15,7 +15,7 @@ libm2sci_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### m2sci : Scilab macros ###
 libm2sci_la_macrodir = $(target)
-nobase_libm2sci_la_macro_DATA22 = macros/m2sci/kernel/is_complex.sci \
+nobase_libm2sci_la_macro_MACROS = macros/m2sci/kernel/is_complex.sci \
 macros/m2sci/kernel/%type_i_variable.sci \
 macros/m2sci/kernel/funcall2sci.sci \
 macros/m2sci/kernel/mtlbtoolfun.sci \

diff --git a/scilab/modules/m2sci/Makefile.in b/scilab/modules/m2sci/Makefile.in
index 9897689..8398678 100644 (file)
--- a/scilab/modules/m2sci/Makefile.in
+++ b/scilab/modules/m2sci/Makefile.in
@@ -225,7 +225,7 @@ libm2sci_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### m2sci : Scilab macros ###
 libm2sci_la_macrodir = $(target)
-nobase_libm2sci_la_macro_DATA22 = macros/m2sci/kernel/is_complex.sci \
+nobase_libm2sci_la_macro_MACROS = macros/m2sci/kernel/is_complex.sci \
 macros/m2sci/kernel/%type_i_variable.sci \
 macros/m2sci/kernel/funcall2sci.sci \
 macros/m2sci/kernel/mtlbtoolfun.sci \
@@ -1625,12 +1625,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/maple2scilab/Makefile.am b/scilab/modules/maple2scilab/Makefile.am
index e87878e..d80a5a7 100644 (file)
--- a/scilab/modules/maple2scilab/Makefile.am
+++ b/scilab/modules/maple2scilab/Makefile.am
@@ -15,7 +15,7 @@ libmaple2scilab_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### maple2scilab : Scilab macros ###
 libmaple2scilab_la_macrodir = $(target)/macros
-libmaple2scilab_la_macro_DATA22 = macros/sci2map.sci macros/sci2map.bin macros/names macros/lib macros/buildmacros.sce
+libmaple2scilab_la_macro_MACROS = macros/sci2map.sci macros/sci2map.bin macros/names macros/lib macros/buildmacros.sce
 
 
 #### maple2scilab : init scripts #### 

diff --git a/scilab/modules/maple2scilab/Makefile.in b/scilab/modules/maple2scilab/Makefile.in
index 2525c1f..7a229cb 100644 (file)
--- a/scilab/modules/maple2scilab/Makefile.in
+++ b/scilab/modules/maple2scilab/Makefile.in
@@ -225,7 +225,7 @@ libmaple2scilab_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### maple2scilab : Scilab macros ###
 libmaple2scilab_la_macrodir = $(target)/macros
-libmaple2scilab_la_macro_DATA22 = macros/sci2map.sci macros/sci2map.bin macros/names macros/lib macros/buildmacros.sce
+libmaple2scilab_la_macro_MACROS = macros/sci2map.sci macros/sci2map.bin macros/names macros/lib macros/buildmacros.sce
 
 #### maple2scilab : init scripts #### 
 libmaple2scilab_la_etcdir = $(target)/etc
@@ -500,12 +500,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/metanet/Makefile.am b/scilab/modules/metanet/Makefile.am
index e9fad9e..4673bf0 100644 (file)
--- a/scilab/modules/metanet/Makefile.am
+++ b/scilab/modules/metanet/Makefile.am
@@ -144,7 +144,7 @@ libscimetanet_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### metanet : Scilab macros ###
 libscimetanet_la_macrodir = $(target)/macros
-libscimetanet_la_macro_DATA22 = macros/ge_do_replot.sci \
+MACROS = macros/ge_do_replot.sci \
 macros/salesman.sci \
 macros/strong_con_nodes.sci \
 macros/perfect_match.sci \

diff --git a/scilab/modules/metanet/Makefile.in b/scilab/modules/metanet/Makefile.in
index 102b281..d154f64 100644 (file)
--- a/scilab/modules/metanet/Makefile.in
+++ b/scilab/modules/metanet/Makefile.in
@@ -423,7 +423,7 @@ libscimetanet_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### metanet : Scilab macros ###
 libscimetanet_la_macrodir = $(target)/macros
-libscimetanet_la_macro_DATA22 = macros/ge_do_replot.sci \
+MACROS = macros/ge_do_replot.sci \
 macros/salesman.sci \
 macros/strong_con_nodes.sci \
 macros/perfect_match.sci \
@@ -1587,12 +1587,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/mexlib/Makefile.am b/scilab/modules/mexlib/Makefile.am
index a176c33..fb13c56 100644 (file)
--- a/scilab/modules/mexlib/Makefile.am
+++ b/scilab/modules/mexlib/Makefile.am
@@ -31,7 +31,7 @@ libscimexlib_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### mexlib : Scilab macros ###
 libscimexlib_la_macrodir = $(target)/macros
-libscimexlib_la_macro_DATA22 = macros/buildmacros.sce
+MACROS = macros/buildmacros.sce
 
 
 #### mexlib : init scripts #### 

diff --git a/scilab/modules/mexlib/Makefile.in b/scilab/modules/mexlib/Makefile.in
index 4408fb3..cedfc73 100644 (file)
--- a/scilab/modules/mexlib/Makefile.in
+++ b/scilab/modules/mexlib/Makefile.in
@@ -266,7 +266,7 @@ libscimexlib_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### mexlib : Scilab macros ###
 libscimexlib_la_macrodir = $(target)/macros
-libscimexlib_la_macro_DATA22 = macros/buildmacros.sce
+MACROS = macros/buildmacros.sce
 
 #### mexlib : init scripts #### 
 libscimexlib_la_etcdir = $(target)/etc
@@ -681,12 +681,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/optimization/Makefile.am b/scilab/modules/optimization/Makefile.am
index 81d9e06..f87d80b 100644 (file)
--- a/scilab/modules/optimization/Makefile.am
+++ b/scilab/modules/optimization/Makefile.am
@@ -160,7 +160,7 @@ libscioptimization_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### optimization : Scilab macros ###
 libscioptimization_la_macrodir = $(target)/macros
-libscioptimization_la_macro_DATA22 = macros/derivative.sci \
+MACROS = macros/derivative.sci \
 macros/linpro.sci \
 macros/quapro.sci \
 macros/fit_dat.sci \

diff --git a/scilab/modules/optimization/Makefile.in b/scilab/modules/optimization/Makefile.in
index 8e1c55f..2b14238 100644 (file)
--- a/scilab/modules/optimization/Makefile.in
+++ b/scilab/modules/optimization/Makefile.in
@@ -439,7 +439,7 @@ libscioptimization_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### optimization : Scilab macros ###
 libscioptimization_la_macrodir = $(target)/macros
-libscioptimization_la_macro_DATA22 = macros/derivative.sci \
+MACROS = macros/derivative.sci \
 macros/linpro.sci \
 macros/quapro.sci \
 macros/fit_dat.sci \
@@ -1410,12 +1410,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/others/Makefile.am b/scilab/modules/others/Makefile.am
index 7ec696a..ef888c1 100644 (file)
--- a/scilab/modules/others/Makefile.am
+++ b/scilab/modules/others/Makefile.am
@@ -15,7 +15,7 @@ libsciothers_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### others : Scilab macros ###
 libsciothers_la_macrodir = $(target)/macros
-libsciothers_la_macro_DATA22 = macros/edit.sci macros/edit.bin macros/names macros/lib macros/buildmacros.sce
+MACROS = macros/edit.sci macros/edit.bin macros/names macros/lib macros/buildmacros.sce
 
 
 #### others : init scripts #### 

diff --git a/scilab/modules/others/Makefile.in b/scilab/modules/others/Makefile.in
index ddbee77..cfb73cb 100644 (file)
--- a/scilab/modules/others/Makefile.in
+++ b/scilab/modules/others/Makefile.in
@@ -228,7 +228,7 @@ libsciothers_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### others : Scilab macros ###
 libsciothers_la_macrodir = $(target)/macros
-libsciothers_la_macro_DATA22 = macros/edit.sci macros/edit.bin macros/names macros/lib macros/buildmacros.sce
+MACROS = macros/edit.sci macros/edit.bin macros/names macros/lib macros/buildmacros.sce
 
 #### others : init scripts #### 
 libsciothers_la_etcdir = $(target)/etc
@@ -706,12 +706,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/overloading/Makefile.am b/scilab/modules/overloading/Makefile.am
index 4b01649..4c93974 100644 (file)
--- a/scilab/modules/overloading/Makefile.am
+++ b/scilab/modules/overloading/Makefile.am
@@ -15,7 +15,7 @@ libscioverloading_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### overloading : Scilab macros ###
 libscioverloading_la_macrodir = $(target)/macros
-libscioverloading_la_macro_DATA22 = macros/%sp_exp.sci \
+MACROS = macros/%sp_exp.sci \
 macros/%spb_h_spb.sci \
 macros/%c_i_st.sci \
 macros/%s_n_hm.sci \
@@ -458,7 +458,6 @@ macros/%hm_k_s.sci \
 macros/generic_i_s.sci \
 macros/%s_q_r.sci \
 macros/%lss_s_r.sci \
-macros/%h_p.sci \
 macros/%r_y_p.sci \
 macros/%hm_cos.sci \
 macros/%hm_q_hm.sci \

diff --git a/scilab/modules/overloading/Makefile.in b/scilab/modules/overloading/Makefile.in
index f4c5560..6b99356 100644 (file)
--- a/scilab/modules/overloading/Makefile.in
+++ b/scilab/modules/overloading/Makefile.in
@@ -226,7 +226,7 @@ libscioverloading_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### overloading : Scilab macros ###
 libscioverloading_la_macrodir = $(target)/macros
-libscioverloading_la_macro_DATA22 = macros/%sp_exp.sci \
+MACROS = macros/%sp_exp.sci \
 macros/%spb_h_spb.sci \
 macros/%c_i_st.sci \
 macros/%s_n_hm.sci \
@@ -669,7 +669,6 @@ macros/%hm_k_s.sci \
 macros/generic_i_s.sci \
 macros/%s_q_r.sci \
 macros/%lss_s_r.sci \
-macros/%h_p.sci \
 macros/%r_y_p.sci \
 macros/%hm_cos.sci \
 macros/%hm_q_hm.sci \
@@ -1705,12 +1704,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/polynomials/Makefile.am b/scilab/modules/polynomials/Makefile.am
index 452f5a8..e18656d 100644 (file)
--- a/scilab/modules/polynomials/Makefile.am
+++ b/scilab/modules/polynomials/Makefile.am
@@ -130,7 +130,7 @@ libscipolynomials_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### polynomials : Scilab macros ###
 libscipolynomials_la_macrodir = $(target)/macros
-libscipolynomials_la_macro_DATA22 = macros/denom.sci \
+MACROS = macros/denom.sci \
 macros/pdiv.sci \
 macros/systmat.sci \
 macros/pol2str.sci \

diff --git a/scilab/modules/polynomials/Makefile.in b/scilab/modules/polynomials/Makefile.in
index 50b09d6..836b2ab 100644 (file)
--- a/scilab/modules/polynomials/Makefile.in
+++ b/scilab/modules/polynomials/Makefile.in
@@ -408,7 +408,7 @@ libscipolynomials_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### polynomials : Scilab macros ###
 libscipolynomials_la_macrodir = $(target)/macros
-libscipolynomials_la_macro_DATA22 = macros/denom.sci \
+MACROS = macros/denom.sci \
 macros/pdiv.sci \
 macros/systmat.sci \
 macros/pol2str.sci \
@@ -1294,12 +1294,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/pvm/Makefile.am b/scilab/modules/pvm/Makefile.am
index 68c3f63..ec04a59 100644 (file)
--- a/scilab/modules/pvm/Makefile.am
+++ b/scilab/modules/pvm/Makefile.am
@@ -74,7 +74,7 @@ libscipvm_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### pvm : Scilab macros ###
 libscipvm_la_macrodir = $(target)/macros
-libscipvm_la_macro_DATA22 = macros/configure_pvm.sci \
+MACROS = macros/configure_pvm.sci \
 macros/with_pvm.sci macros/configure_pvm.bin \
 macros/with_pvm.bin macros/names macros/lib macros/buildmacros.sce
 

diff --git a/scilab/modules/randlib/Makefile.am b/scilab/modules/randlib/Makefile.am
index b78abcb..2f90447 100644 (file)
--- a/scilab/modules/randlib/Makefile.am
+++ b/scilab/modules/randlib/Makefile.am
@@ -67,7 +67,7 @@ libscirandlib_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### randlib : Scilab macros ###
 libscirandlib_la_macrodir = $(target)/macros
-libscirandlib_la_macro_DATA22 =  macros/buildmacros.sce
+MACROS =  macros/buildmacros.sce
 
 
 #### randlib : init scripts #### 

diff --git a/scilab/modules/randlib/Makefile.in b/scilab/modules/randlib/Makefile.in
index b48c12d..9f72f2f 100644 (file)
--- a/scilab/modules/randlib/Makefile.in
+++ b/scilab/modules/randlib/Makefile.in
@@ -324,7 +324,7 @@ libscirandlib_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### randlib : Scilab macros ###
 libscirandlib_la_macrodir = $(target)/macros
-libscirandlib_la_macro_DATA22 = macros/buildmacros.sce
+MACROS = macros/buildmacros.sce
 
 #### randlib : init scripts #### 
 libscirandlib_la_etcdir = $(target)/etc
@@ -940,12 +940,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/sci2c/Makefile.am b/scilab/modules/sci2c/Makefile.am
index 33adb62..c9461c1 100644 (file)
--- a/scilab/modules/sci2c/Makefile.am
+++ b/scilab/modules/sci2c/Makefile.am
@@ -11,7 +11,7 @@ libsci2c_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### sci2c : Scilab macros ###
 libsci2c_la_macrodir = $(target)/macros
-libsci2c_la_macro_DATA22 = macros/sci2c.sci  macros/names macros/lib macros/buildmacros.sce
+libsci2c_la_macro_MACROS = macros/sci2c.sci  macros/names macros/lib macros/buildmacros.sce
 
 
 #### sci2c : init scripts #### 

diff --git a/scilab/modules/scicos/Makefile.am b/scilab/modules/scicos/Makefile.am
index 6ed0f97..dadec92 100644 (file)
--- a/scilab/modules/scicos/Makefile.am
+++ b/scilab/modules/scicos/Makefile.am
@@ -239,7 +239,7 @@ libsciscicos_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### scicos : Scilab macros ###
 libsciscicos_la_macrodir = $(target)
-nobase_libsciscicos_la_macro_DATA22 = macros/scicos_blocks/Sources/TIME_f.sci \
+nobase_MACROS = macros/scicos_blocks/Sources/TIME_f.sci \
 macros/scicos_blocks/Sources/GENSQR_f.sci \
 macros/scicos_blocks/Sources/CLKIN_f.sci \
 macros/scicos_blocks/Sources/READAU_f.sci \

diff --git a/scilab/modules/scicos/Makefile.in b/scilab/modules/scicos/Makefile.in
index 5593b3a..4627dc4 100644 (file)
--- a/scilab/modules/scicos/Makefile.in
+++ b/scilab/modules/scicos/Makefile.in
@@ -713,7 +713,7 @@ MACROSMASK = *.sci
 
 #### scicos : Scilab macros ###
 @SCICOS_TRUE@libsciscicos_la_macrodir = $(target)
-@SCICOS_TRUE@nobase_libsciscicos_la_macro_DATA22 = macros/scicos_blocks/Sources/TIME_f.sci \
+@SCICOS_TRUE@nobase_MACROS = macros/scicos_blocks/Sources/TIME_f.sci \
 @SCICOS_TRUE@macros/scicos_blocks/Sources/GENSQR_f.sci \
 @SCICOS_TRUE@macros/scicos_blocks/Sources/CLKIN_f.sci \
 @SCICOS_TRUE@macros/scicos_blocks/Sources/READAU_f.sci \
@@ -3404,12 +3404,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/scilab2fortran/Makefile.am b/scilab/modules/scilab2fortran/Makefile.am
index 0f7c979..1dad731 100644 (file)
--- a/scilab/modules/scilab2fortran/Makefile.am
+++ b/scilab/modules/scilab2fortran/Makefile.am
@@ -15,7 +15,7 @@ libscilab2fortran_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### scilab2fortran : Scilab macros ###
 libscilab2fortran_la_macrodir = $(target)/macros
-libscilab2fortran_la_macro_DATA22 = macros/f_gener.sci \
+libscilab2fortran_la_macro_MACROS = macros/f_gener.sci \
 macros/setparam.sci \
 macros/%a2for.sci \
 macros/%log2for.sci \

diff --git a/scilab/modules/scilab2fortran/Makefile.in b/scilab/modules/scilab2fortran/Makefile.in
index 22c3a59..31f78fa 100644 (file)
--- a/scilab/modules/scilab2fortran/Makefile.in
+++ b/scilab/modules/scilab2fortran/Makefile.in
@@ -229,7 +229,7 @@ libscilab2fortran_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### scilab2fortran : Scilab macros ###
 libscilab2fortran_la_macrodir = $(target)/macros
-libscilab2fortran_la_macro_DATA22 = macros/f_gener.sci \
+libscilab2fortran_la_macro_MACROS = macros/f_gener.sci \
 macros/setparam.sci \
 macros/%a2for.sci \
 macros/%log2for.sci \
@@ -677,12 +677,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/scipad/Makefile.am b/scilab/modules/scipad/Makefile.am
index bae4894..178332d 100644 (file)
--- a/scilab/modules/scipad/Makefile.am
+++ b/scilab/modules/scipad/Makefile.am
@@ -15,7 +15,7 @@ libsciscipad_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### scipad : Scilab macros ###
 libsciscipad_la_macrodir = $(target)
-nobase_libsciscipad_la_macro_DATA22 = macros/scipad_internals/lib \
+nobase_MACROS = macros/scipad_internals/lib \
 macros/scipad_internals/LocalizeForScipad.sci \
 macros/scipad_internals/ext_exists.sci \
 macros/scipad_internals/msgdiff.sci \

diff --git a/scilab/modules/scipad/Makefile.in b/scilab/modules/scipad/Makefile.in
index 28ddb0c..61196af 100644 (file)
--- a/scilab/modules/scipad/Makefile.in
+++ b/scilab/modules/scipad/Makefile.in
@@ -225,7 +225,7 @@ libsciscipad_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### scipad : Scilab macros ###
 libsciscipad_la_macrodir = $(target)
-nobase_libsciscipad_la_macro_DATA22 = macros/scipad_internals/lib \
+nobase_MACROS = macros/scipad_internals/lib \
 macros/scipad_internals/LocalizeForScipad.sci \
 macros/scipad_internals/ext_exists.sci \
 macros/scipad_internals/msgdiff.sci \
@@ -516,12 +516,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/signal_processing/Makefile.am b/scilab/modules/signal_processing/Makefile.am
index 253e8b0..46b845d 100644 (file)
--- a/scilab/modules/signal_processing/Makefile.am
+++ b/scilab/modules/signal_processing/Makefile.am
@@ -115,7 +115,7 @@ libscisignal_processing_la_root_DATA = changelog.txt licence.txt readme.txt VERS
 
 #### signal_processing : Scilab macros ###
 libscisignal_processing_la_macrodir = $(target)/macros
-libscisignal_processing_la_macro_DATA22 = macros/srkf.sci \
+libscisignal_processing_la_macro_MACROS = macros/srkf.sci \
 macros/intdec.sci \
 macros/phc.sci \
 macros/lindquist.sci \

diff --git a/scilab/modules/signal_processing/Makefile.in b/scilab/modules/signal_processing/Makefile.in
index e882985..36a347b 100644 (file)
--- a/scilab/modules/signal_processing/Makefile.in
+++ b/scilab/modules/signal_processing/Makefile.in
@@ -387,7 +387,7 @@ libscisignal_processing_la_root_DATA = changelog.txt licence.txt readme.txt VERS
 
 #### signal_processing : Scilab macros ###
 libscisignal_processing_la_macrodir = $(target)/macros
-libscisignal_processing_la_macro_DATA22 = macros/srkf.sci \
+libscisignal_processing_la_macro_MACROS = macros/srkf.sci \
 macros/intdec.sci \
 macros/phc.sci \
 macros/lindquist.sci \
@@ -1301,12 +1301,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/sound/Makefile.am b/scilab/modules/sound/Makefile.am
index 810e204..9659dca 100644 (file)
--- a/scilab/modules/sound/Makefile.am
+++ b/scilab/modules/sound/Makefile.am
@@ -40,7 +40,7 @@ libscisound_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### sound : Scilab macros ###
 libscisound_la_macrodir = $(target)/macros
-libscisound_la_macro_DATA22 = macros/analyze.sci \
+MACROS = macros/analyze.sci \
 macros/soundsec.sci \
 macros/lin2mu.sci \
 macros/mapsound.sci \

diff --git a/scilab/modules/sound/Makefile.in b/scilab/modules/sound/Makefile.in
index 0dbd7fe..258ec66 100644 (file)
--- a/scilab/modules/sound/Makefile.in
+++ b/scilab/modules/sound/Makefile.in
@@ -285,7 +285,7 @@ libscisound_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### sound : Scilab macros ###
 libscisound_la_macrodir = $(target)/macros
-libscisound_la_macro_DATA22 = macros/analyze.sci \
+MACROS = macros/analyze.sci \
 macros/soundsec.sci \
 macros/lin2mu.sci \
 macros/mapsound.sci \
@@ -852,12 +852,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/sparse/Makefile.am b/scilab/modules/sparse/Makefile.am
index 97838d0..3ee7e35 100644 (file)
--- a/scilab/modules/sparse/Makefile.am
+++ b/scilab/modules/sparse/Makefile.am
@@ -186,7 +186,7 @@ libscisparse_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### sparse : Scilab macros ###
 libscisparse_la_macrodir = $(target)/macros
-libscisparse_la_macro_DATA22 = macros/adj2sp.sci \
+MACROS = macros/adj2sp.sci \
 macros/sp2adj.sci \
 macros/issparse.sci \
 macros/pcg.sci \

diff --git a/scilab/modules/sparse/Makefile.in b/scilab/modules/sparse/Makefile.in
index b5276ef..6779786 100644 (file)
--- a/scilab/modules/sparse/Makefile.in
+++ b/scilab/modules/sparse/Makefile.in
@@ -471,7 +471,7 @@ libscisparse_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### sparse : Scilab macros ###
 libscisparse_la_macrodir = $(target)/macros
-libscisparse_la_macro_DATA22 = macros/adj2sp.sci \
+MACROS = macros/adj2sp.sci \
 macros/sp2adj.sci \
 macros/issparse.sci \
 macros/pcg.sci \
@@ -1570,12 +1570,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/special_functions/Makefile.am b/scilab/modules/special_functions/Makefile.am
index 06ebc5e..408f93b 100644 (file)
--- a/scilab/modules/special_functions/Makefile.am
+++ b/scilab/modules/special_functions/Makefile.am
@@ -62,7 +62,7 @@ libscispecial_functions_la_root_DATA = changelog.txt licence.txt readme.txt VERS
 
 #### special_functions : Scilab macros ###
 libscispecial_functions_la_macrodir = $(target)/macros
-libscispecial_functions_la_macro_DATA22 =  macros/buildmacros.sce
+libscispecial_functions_la_macro_MACROS =  macros/buildmacros.sce
 
 
 #### special_functions : init scripts #### 

diff --git a/scilab/modules/special_functions/Makefile.in b/scilab/modules/special_functions/Makefile.in
index a7c724b..90ed5ab 100644 (file)
--- a/scilab/modules/special_functions/Makefile.in
+++ b/scilab/modules/special_functions/Makefile.in
@@ -312,7 +312,7 @@ libscispecial_functions_la_root_DATA = changelog.txt licence.txt readme.txt VERS
 
 #### special_functions : Scilab macros ###
 libscispecial_functions_la_macrodir = $(target)/macros
-libscispecial_functions_la_macro_DATA22 = macros/buildmacros.sce
+libscispecial_functions_la_macro_MACROS = macros/buildmacros.sce
 
 #### special_functions : init scripts #### 
 libscispecial_functions_la_etcdir = $(target)/etc
@@ -892,12 +892,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/statistics/Makefile.am b/scilab/modules/statistics/Makefile.am
index 3af2b67..d5d4e9d 100644 (file)
--- a/scilab/modules/statistics/Makefile.am
+++ b/scilab/modules/statistics/Makefile.am
@@ -116,7 +116,7 @@ libscistatistics_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### statistics : Scilab macros ###
 libscistatistics_la_macrodir = $(target)/macros
-libscistatistics_la_macro_DATA22 = macros/cmoment.sci \
+MACROS = macros/cmoment.sci \
 macros/strange.sci \
 macros/wcenter.sci \
 macros/regress.sci \

diff --git a/scilab/modules/statistics/Makefile.in b/scilab/modules/statistics/Makefile.in
index 64a45d9..7b6603d 100644 (file)
--- a/scilab/modules/statistics/Makefile.in
+++ b/scilab/modules/statistics/Makefile.in
@@ -387,7 +387,7 @@ libscistatistics_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### statistics : Scilab macros ###
 libscistatistics_la_macrodir = $(target)/macros
-libscistatistics_la_macro_DATA22 = macros/cmoment.sci \
+MACROS = macros/cmoment.sci \
 macros/strange.sci \
 macros/wcenter.sci \
 macros/regress.sci \
@@ -1241,12 +1241,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/string/Makefile.am b/scilab/modules/string/Makefile.am
index 0e171cc..eb147df 100644 (file)
--- a/scilab/modules/string/Makefile.am
+++ b/scilab/modules/string/Makefile.am
@@ -70,7 +70,7 @@ libscistring_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### string : Scilab macros ###
 libscistring_la_macrodir = $(target)/macros
-libscistring_la_macro_DATA22 = macros/dec2hex.sci \
+MACROS = macros/dec2hex.sci \
 macros/hex2dec.sci \
 macros/tokenpos.sci \
 macros/evstr.sci \

diff --git a/scilab/modules/string/Makefile.in b/scilab/modules/string/Makefile.in
index c47e450..8a454b8 100644 (file)
--- a/scilab/modules/string/Makefile.in
+++ b/scilab/modules/string/Makefile.in
@@ -330,7 +330,7 @@ libscistring_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### string : Scilab macros ###
 libscistring_la_macrodir = $(target)/macros
-libscistring_la_macro_DATA22 = macros/dec2hex.sci \
+MACROS = macros/dec2hex.sci \
 macros/hex2dec.sci \
 macros/tokenpos.sci \
 macros/evstr.sci \
@@ -996,12 +996,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/symbolic/Makefile.am b/scilab/modules/symbolic/Makefile.am
index 79215ba..1abd596 100644 (file)
--- a/scilab/modules/symbolic/Makefile.am
+++ b/scilab/modules/symbolic/Makefile.am
@@ -37,7 +37,7 @@ libscisymbolic_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### symbolic : Scilab macros ###
 libscisymbolic_la_macrodir = $(target)/macros
-libscisymbolic_la_macro_DATA22 =  macros/buildmacros.sce
+MACROS =  macros/buildmacros.sce
 
 
 #### symbolic : init scripts #### 

diff --git a/scilab/modules/symbolic/Makefile.in b/scilab/modules/symbolic/Makefile.in
index f3e06e1..fdfd233 100644 (file)
--- a/scilab/modules/symbolic/Makefile.in
+++ b/scilab/modules/symbolic/Makefile.in
@@ -285,7 +285,7 @@ libscisymbolic_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### symbolic : Scilab macros ###
 libscisymbolic_la_macrodir = $(target)/macros
-libscisymbolic_la_macro_DATA22 = macros/buildmacros.sce
+MACROS = macros/buildmacros.sce
 
 #### symbolic : init scripts #### 
 libscisymbolic_la_etcdir = $(target)/etc
@@ -781,12 +781,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/tclsci/Makefile.am b/scilab/modules/tclsci/Makefile.am
index 07f86a9..da3b17a 100644 (file)
--- a/scilab/modules/tclsci/Makefile.am
+++ b/scilab/modules/tclsci/Makefile.am
@@ -66,7 +66,7 @@ libscitclsci_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### tclsci : Scilab macros ###
 libscitclsci_la_macrodir = $(target)/macros
-libscitclsci_la_macro_DATA22 = macros/TK_SetVar.sci \
+MACROS = macros/TK_SetVar.sci \
 macros/IsAScalar.sci \
 macros/uimenu.sci \
 macros/config.sci \

diff --git a/scilab/modules/tclsci/Makefile.in b/scilab/modules/tclsci/Makefile.in
index 50af78f..51da026 100644 (file)
--- a/scilab/modules/tclsci/Makefile.in
+++ b/scilab/modules/tclsci/Makefile.in
@@ -334,7 +334,7 @@ libscitclsci_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### tclsci : Scilab macros ###
 libscitclsci_la_macrodir = $(target)/macros
-libscitclsci_la_macro_DATA22 = macros/TK_SetVar.sci \
+MACROS = macros/TK_SetVar.sci \
 macros/IsAScalar.sci \
 macros/uimenu.sci \
 macros/config.sci \
@@ -1381,12 +1381,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/texmacs/Makefile.am b/scilab/modules/texmacs/Makefile.am
index 52757e0..64a6547 100644 (file)
--- a/scilab/modules/texmacs/Makefile.am
+++ b/scilab/modules/texmacs/Makefile.am
@@ -16,7 +16,7 @@ libscitexmacs_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### texmacs : Scilab macros ###
 libscitexmacs_la_macrodir = $(target)/macros
-libscitexmacs_la_macro_DATA22 = macros/%p_p.sci \
+MACROS = macros/%p_p.sci \
 macros/%b_p.sci \
 macros/%r_p.sci \
 macros/%c_p.sci \

diff --git a/scilab/modules/texmacs/Makefile.in b/scilab/modules/texmacs/Makefile.in
index 810de7e..a249d98 100644 (file)
--- a/scilab/modules/texmacs/Makefile.in
+++ b/scilab/modules/texmacs/Makefile.in
@@ -225,7 +225,7 @@ libscitexmacs_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### texmacs : Scilab macros ###
 libscitexmacs_la_macrodir = $(target)/macros
-libscitexmacs_la_macro_DATA22 = macros/%p_p.sci \
+MACROS = macros/%p_p.sci \
 macros/%b_p.sci \
 macros/%r_p.sci \
 macros/%c_p.sci \
@@ -521,12 +521,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/tfds/Makefile.am b/scilab/modules/tfds/Makefile.am
index ff211e8..f48677b 100644 (file)
--- a/scilab/modules/tfds/Makefile.am
+++ b/scilab/modules/tfds/Makefile.am
@@ -15,7 +15,7 @@ libscitfds_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### tfds : Scilab macros ###
 libscitfds_la_macrodir = $(target)/macros
-libscitfds_la_macro_DATA22 = macros/artest.sci \
+MACROS = macros/artest.sci \
 macros/logr.sci \
 macros/bifish.sci \
 macros/portrait.sci \

diff --git a/scilab/modules/tfds/Makefile.in b/scilab/modules/tfds/Makefile.in
index ac3b8ae..d898453 100644 (file)
--- a/scilab/modules/tfds/Makefile.in
+++ b/scilab/modules/tfds/Makefile.in
@@ -225,7 +225,7 @@ libscitfds_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### tfds : Scilab macros ###
 libscitfds_la_macrodir = $(target)/macros
-libscitfds_la_macro_DATA22 = macros/artest.sci \
+MACROS = macros/artest.sci \
 macros/logr.sci \
 macros/bifish.sci \
 macros/portrait.sci \
@@ -545,12 +545,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/time/Makefile.am b/scilab/modules/time/Makefile.am
index 2201da8..4d9d074 100644 (file)
--- a/scilab/modules/time/Makefile.am
+++ b/scilab/modules/time/Makefile.am
@@ -42,7 +42,7 @@ libscitime_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### time : Scilab macros ###
 libscitime_la_macrodir = $(target)/macros
-libscitime_la_macro_DATA22 = macros/etime.sci \
+MACROS = macros/etime.sci \
 macros/now.sci \
 macros/toc.sci \
 macros/calendar.sci \

diff --git a/scilab/modules/time/Makefile.in b/scilab/modules/time/Makefile.in
index 0cbe1f3..f224be6 100644 (file)
--- a/scilab/modules/time/Makefile.in
+++ b/scilab/modules/time/Makefile.in
@@ -287,7 +287,7 @@ libscitime_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### time : Scilab macros ###
 libscitime_la_macrodir = $(target)/macros
-libscitime_la_macro_DATA22 = macros/etime.sci \
+MACROS = macros/etime.sci \
 macros/now.sci \
 macros/toc.sci \
 macros/calendar.sci \
@@ -831,12 +831,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi
 

diff --git a/scilab/modules/wintools/Makefile.am b/scilab/modules/wintools/Makefile.am
index 17f1d45..a184f03 100644 (file)
--- a/scilab/modules/wintools/Makefile.am
+++ b/scilab/modules/wintools/Makefile.am
@@ -46,7 +46,7 @@ libsciwintools_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### wintools : Scilab macros ###
 libsciwintools_la_macrodir = $(target)/macros
-libsciwintools_la_macro_DATA22 =  macros/buildmacros.sce 
+MACROS =  macros/buildmacros.sce 
 
 
 #### wintools : init scripts #### 

diff --git a/scilab/modules/wintools/Makefile.in b/scilab/modules/wintools/Makefile.in
index c8cf934..e66c7c9 100644 (file)
--- a/scilab/modules/wintools/Makefile.in
+++ b/scilab/modules/wintools/Makefile.in
@@ -301,7 +301,7 @@ libsciwintools_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 
 #### wintools : Scilab macros ###
 libsciwintools_la_macrodir = $(target)/macros
-libsciwintools_la_macro_DATA22 = macros/buildmacros.sce 
+MACROS = macros/buildmacros.sce 
 
 #### wintools : init scripts #### 
 libsciwintools_la_etcdir = $(target)/etc
@@ -891,12 +891,11 @@ install-data-local: $(MACROS)
        @if test ! -z "$(MACROS)"; then \
        for dir in $(MACROSDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if ls -lLd $(srcdir)/$$dir/$(MACROSMASK)  >/dev/null 2>&1; then \
-                 for file in $(srcdir)/$$dir/$(MACROSMASK) ; do \
+                       echo "file in "$(srcdir)/$$dir; \
+                 for file in $(MACROS); do \
                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
                  done ; \
-               fi; \
        done; \
        fi