From: asv <asv@opencascade.com>
Date: Tue, 27 Jun 2006 07:42:15 +0000 (+0000)
Subject: Fix to bug PAL10465.
X-Git-Tag: T3_2_1_pre~28
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6001bdbaa6679519784bc1adbdbe9aa30f215eec;p=modules%2Fgeom.git

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 8805b6d6d..8a907ac9e 100644
--- 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 1a444a104..48ec8ad27 100644
--- a/configure.in.base
+++ b/configure.in.base
@@ -28,6 +28,10 @@ XVERSION=0x030200
 AC_SUBST(VERSION)
 AC_SUBST(XVERSION)
 
+# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
+MODULE_NAME=geom
+AC_SUBST(MODULE_NAME)
+
 dnl
 dnl Initialize source and build root directories
 dnl
@@ -325,7 +329,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 6fa3c613d..05512c6cc 100644
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -6,7 +6,7 @@
   </section>
   <section name="resources">
     <!-- Module resources -->
-    <parameter name="GEOM" value="${GEOM_ROOT_DIR}/share/salome/resources"/>
+    <parameter name="GEOM" value="${GEOM_ROOT_DIR}/share/salome/resources/geom"/>
   </section>
   <section name="Geometry" >
     <!-- Other module preferences -->
diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
index 54155661b..8bb1c2851 100644
--- a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
@@ -383,9 +383,9 @@ Standard_Boolean GEOMImpl_IInsertOperations::InitResMgr()
     // Initialize the Resource Manager
     TCollection_AsciiString aResDir (getenv("GEOM_ROOT_DIR"));
 #ifdef WNT
-    aResDir += "\\share\\salome\\resources";
+    aResDir += "\\share\\salome\\resources\\geom";
 #else
-    aResDir += "/share/salome/resources";
+    aResDir += "/share/salome/resources/geom";
 #endif
     char * dir = getenv("GEOM_ENGINE_RESOURCES_DIR");
     TCollection_AsciiString aUserResDir;