Fix a problem of 'make install' step for resource files.

diff --git a/salome_adm/unix/make_conclude.in b/salome_adm/unix/make_conclude.in
index 20c528c52317477a70fde63eef4616efc0621c1c..d5d4a5d14c30fb654471fb933e9742ddefbbc50b 100644 (file)
--- a/salome_adm/unix/make_conclude.in
+++ b/salome_adm/unix/make_conclude.in
@@ -152,7 +152,9 @@ $(DEST_HEADERS): $(inc_builddir)/%: %
        cp -f $< $@
 
 # build resources file (icons and messages) : .qm file from .po file
-RESOURCES_FILES_ALL = $(notdir $(wildcard $(srcdir)/resources/*))
+RESOURCES_FILES_ALL := $(notdir $(wildcard $(srcdir)/resources/*))
+RESOURCES_FILES_ALL := $(filter-out CVS, $(RESOURCES_FILES_ALL))
+RESOURCES_FILES_ALL := $(filter-out %.po, $(RESOURCES_FILES_ALL))
 RESOURCES_FILES ?= $(RESOURCES_FILES_ALL)
 
 resources: resources-po resources-cp 
@@ -162,9 +164,7 @@ resources-po: $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/%.qm)
 resources-cp: $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%)
 
 $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%): $(top_builddir)/share/salome/resources/% : %
-       if [ $(notdir $<) != "CVS" ] ; then \
-           cp -fr $< $@; \
-       fi
+       cp -fr $< $@;
 
 # Make installation directories if they don't exist.
 $(libdir) $(includedir) $(bindir) $(datadir) $(idldir) $(sharedpydir):

diff --git a/salome_adm/unix/make_module.in b/salome_adm/unix/make_module.in
index fd0296f07d7007d7f38c77a2f91dbe9e8b253377..cb13120236f435896bd49d6717b0f6a51db6ba13 100644 (file)
--- a/salome_adm/unix/make_module.in
+++ b/salome_adm/unix/make_module.in
@@ -45,7 +45,9 @@ depend:
        done
 
 # copy all resources files in common directory
-RESOURCES_FILES_ALL = $(notdir $(wildcard $(srcdir)/resources/*))
+RESOURCES_FILES_ALL := $(notdir $(wildcard $(srcdir)/resources/*))
+RESOURCES_FILES_ALL := $(filter-out CVS, $(RESOURCES_FILES_ALL))
+RESOURCES_FILES_ALL := $(filter-out %.po, $(RESOURCES_FILES_ALL))
 RESOURCES_FILES ?= $(RESOURCES_FILES_ALL)
 
 resources: $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%)
@@ -54,9 +56,7 @@ resources: $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%)
        done
 
 $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%): $(top_builddir)/share/salome/resources/% : %
-       if [ $(notdir $<) != "CVS" ] ; then \
-           cp -fr $< $@; \
-       fi
+       cp -fr $< $@;
 
 data:
        @if test "X$(top_builddir)" = "X."; then                                                         \