PR: V3_2_1 utilise share/salome/resources/(module)

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 20cf62aa914943e04e7aeb1eebc9785525e51899..a7820679f2f932b12e1a6e597b6231457d6a9989 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 b145014addaf14036fe94eb6c2629c7c30f4d49c..7fb303d7b4796a57b4294487b13013a2ae26de4a 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -22,8 +22,14 @@ AC_CANONICAL_HOST
 PACKAGE=salome
 AC_SUBST(PACKAGE)
 
-VERSION=0.0.1
+VERSION=3.2.1
+XVERSION=0x030201
 AC_SUBST(VERSION)
+AC_SUBST(XVERSION)
+
+# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
+MODULE_NAME=eficas
+AC_SUBST(MODULE_NAME)
 
 dnl
 dnl Initialize source and build root directories
@@ -215,7 +221,7 @@ else
 fi
 
 # make other build directories
-for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources share/salome/doc idl
+for rep in salome_adm adm_local doc bin/salome include/salome lib/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 2f93421be8c5e72c8f13359b6ea560953f0f22e4..8762806aecb2dc1e711ddc91ca84484c3f8a3f25 100644 (file)
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -7,6 +7,6 @@
   </section>
   <section name="resources">
     <!-- Module resources -->
-    <parameter name="EFICAS" value="${EFICAS_ROOT_DIR}/share/salome/resources"/>
+    <parameter name="EFICAS" value="${EFICAS_ROOT_DIR}/share/salome/resources/eficas"/>
   </section>
 </document>