Fix to bug PAL10465.

Modification of resource files location in "build" and "installation" directories.  Now resource files are placed in share/salome/resources/<module_name>.  Various configuration files (configure.in.base, make_module/conclude/commence, etc.) are changed.

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index a84dfbb7c5017aa73bb2fbccfed5d01daa09501f..ed5b70bf2d91396cfa5213a4c35fcb91f80a75d4 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -7,6 +7,8 @@
 # common directories to put headerfiles
 inc_builddir=$(top_builddir)/include/salome
 
+MODULE_NAME=@MODULE_NAME@
+
 @SET_MAKE@
 SHELL=/bin/sh
 

diff --git a/configure.in.base b/configure.in.base
index d3530f5dbedd384132bff4889a330c72b71898ab..1cb21e253925f4df4c50482bf0cf83e0fa499b7b 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -27,6 +27,10 @@ XVERSION=0x030200
 AC_SUBST(VERSION)
 AC_SUBST(XVERSION)
 
+# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
+MODULE_NAME=sierpinsky
+AC_SUBST(MODULE_NAME)
+
 dnl
 dnl Initialize source and build root directories
 dnl
@@ -373,7 +377,7 @@ else
 fi
 
 # make other build directories
-for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources share/salome/doc idl
+for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} share/salome/doc idl
 do
 #   if test ! -d $rep ; then
 #      eval mkdir $rep

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
index dde8c9d45a20318bea81ed7c66170fd11444fb9d..93e0a4746f44987ea80507ee91d57f0101bbb7f2 100644 (file)
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -6,6 +6,6 @@
   </section>
   <section name="resources">
     <!-- Module resources -->
-    <parameter name="SIERPINSKY" value="${SIERPINSKY_ROOT_DIR}/share/salome/resources"/>
+    <parameter name="SIERPINSKY" value="${SIERPINSKY_ROOT_DIR}/share/salome/resources/sierpinsky"/>
   </section>
 </document>