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 3e8f8b8f34959ad4aeb7620bae959090989a8026..1b0760540c5b7be8af99a6ea03e0b2d9971ba596 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -1,6 +1,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 056ea3974d97bdd03a3f5fc2582478963084ef72..dac3060ce0e46a995475d0f6141deaaa38efa3ff 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=superv
+AC_SUBST(MODULE_NAME)
+
 dnl
 dnl Initialize source and build root directories
 dnl
@@ -329,7 +333,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 idl
+for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl
 do
 #   if test ! -d $rep ; then
 #      eval mkdir $rep

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
index 4848fae44e9c81d86609d8aff584f6097d3c25e5..70797d440491a6c296359a74722646ed42633024 100644 (file)
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -6,6 +6,6 @@
   </section>
   <section name="resources">
     <!-- Module resources -->
-    <parameter name="SUPERV" value="${SUPERV_ROOT_DIR}/share/salome/resources"/>
+    <parameter name="SUPERV" value="${SUPERV_ROOT_DIR}/share/salome/resources/superv"/>
   </section>
 </document>