From 96371a959a8a6a26731d9f6aa4af9f3faed412e4 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 5 Sep 2005 10:31:32 +0000 Subject: [PATCH] Fix a problem of 'make install' step for resource files. --- salome_adm/unix/make_conclude.in | 8 ++++---- salome_adm/unix/make_module.in | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/salome_adm/unix/make_conclude.in b/salome_adm/unix/make_conclude.in index 20c528c52..d5d4a5d14 100644 --- 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 fd0296f07..cb1312023 100644 --- 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 \ -- 2.39.2