SALOME versioning system improvement

diff --git a/salome_adm/unix/DEPRECATED/make_module.in b/salome_adm/unix/DEPRECATED/make_module.in
index b717e7551bcee945ea8036961cd6d222bf5f0ca2..bb26129cb9da88e228a6caa8afbfb5754b870589 100644 (file)
--- a/salome_adm/unix/DEPRECATED/make_module.in
+++ b/salome_adm/unix/DEPRECATED/make_module.in
@@ -51,11 +51,13 @@ RESOURCES_FILES_ALL := $(filter-out %.po, $(RESOURCES_FILES_ALL))
 RESOURCES_FILES_ALL := $(filter-out %.in, $(RESOURCES_FILES_ALL))
 RESOURCES_FILES ?= $(RESOURCES_FILES_ALL)
 
-resources: $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%)
+resources: resources-cp
        @@SETX@; for d in $(SUBDIRS); do        \
           (cd $$d && $(MAKE) $@) || exit 1;    \
        done
 
+resources-cp: $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%)
+
 $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%): $(top_builddir)/share/salome/resources/% : %
        cp -fr $< $@;
 
@@ -105,10 +107,10 @@ distclean: clean
        -$(RM) $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%)
        -$(RM) Makefile
 
-install-resources:
+install-resources: resources-cp
 # one resources directory for all salome modules
        $(INSTALL) -d $(datadir)/resources
-       for f in X $(RESOURCES_FILES:%=$(srcdir)/resources/%); do \
+       @for f in X $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%); do \
           if test $$f != X; then                                                        \
             ($(INSTALL_DATA) $$f $(datadir)/resources/. || exit 1);                     \
           fi;                                                                           \