From: vsr <vsr@opencascade.com>
Date: Fri, 26 May 2006 08:28:17 +0000 (+0000)
Subject: SALOME versioning system improvement
X-Git-Tag: V3_2_0rc~8
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9ae780d5687c8e4d7811c584aa2ad200d00e8cd0;p=modules%2Fkernel.git

SALOME versioning system improvement
---

diff --git a/salome_adm/unix/DEPRECATED/make_module.in b/salome_adm/unix/DEPRECATED/make_module.in
index b717e7551..bb26129cb 100644
--- 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; 										 \